diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index eea28d8..2852223 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="BusinessSettlementList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery, dictType } from './businessSettlement-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -19,6 +21,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 })
@@ -32,27 +36,29 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 }
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
-  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价(元)', value: 'postedPrice', align: 'center' },
-  { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
-  { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
+  { text: '样品库房', value: 'sampleWarehouse', align: 'center' },
+  { text: '证书库房', value: 'certWarehouse', align: 'center' },
+  { text: '费用状态', value: 'feeStatus', align: 'center' },
+  { text: '是否到账', value: 'received', align: 'center' },
+  { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
+  { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
+  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
+  { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -69,10 +75,7 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
-        totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
-        extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
-        postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
     total.value = parseInt(response.data.total)
@@ -93,9 +96,12 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
+    orderTimeStart: '', //	委托日期开始
+    orderTimeEnd: '', //	委托日期结束
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 
@@ -121,6 +127,8 @@
       customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       deliverer: listQuery.value.deliverer, // 送样人
+      orderTimeStart: listQuery.value.orderTimeStart, //	委托日期开始
+      orderTimeEnd: listQuery.value.orderTimeEnd, //	委托日期结束
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -210,6 +218,18 @@
   })
 }
 
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.orderTimeStart = `${val[0]}`
+    listQuery.value.orderTimeEnd = `${val[1]}`
+  }
+  else {
+    listQuery.value.orderTimeStart = ''
+    listQuery.value.orderTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict() // 获取字典
   fetchData(true) // 获取数据
@@ -224,7 +244,7 @@
         <search-item>
           <el-input
             v-model.trim="listQuery.orderCode"
-            placeholder="委托书编号"
+            placeholder="委托单编号"
             class="short-input"
             clearable
           />
@@ -246,11 +266,9 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.deliverer"
-            placeholder="送样人"
-            class="short-input"
-            clearable
+          <el-date-picker
+            v-model="timeRange" type="daterange" range-separator="到" format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" start-placeholder="委托日期(开始)" end-placeholder="委托日期(结束)" clearable
           />
         </search-item>
       </search-area>

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index eea28d8..2852223 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="BusinessSettlementList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery, dictType } from './businessSettlement-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -19,6 +21,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 })
@@ -32,27 +36,29 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 }
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
-  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价(元)', value: 'postedPrice', align: 'center' },
-  { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
-  { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
+  { text: '样品库房', value: 'sampleWarehouse', align: 'center' },
+  { text: '证书库房', value: 'certWarehouse', align: 'center' },
+  { text: '费用状态', value: 'feeStatus', align: 'center' },
+  { text: '是否到账', value: 'received', align: 'center' },
+  { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
+  { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
+  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
+  { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -69,10 +75,7 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
-        totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
-        extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
-        postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
     total.value = parseInt(response.data.total)
@@ -93,9 +96,12 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
+    orderTimeStart: '', //	委托日期开始
+    orderTimeEnd: '', //	委托日期结束
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 
@@ -121,6 +127,8 @@
       customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       deliverer: listQuery.value.deliverer, // 送样人
+      orderTimeStart: listQuery.value.orderTimeStart, //	委托日期开始
+      orderTimeEnd: listQuery.value.orderTimeEnd, //	委托日期结束
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -210,6 +218,18 @@
   })
 }
 
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.orderTimeStart = `${val[0]}`
+    listQuery.value.orderTimeEnd = `${val[1]}`
+  }
+  else {
+    listQuery.value.orderTimeStart = ''
+    listQuery.value.orderTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict() // 获取字典
   fetchData(true) // 获取数据
@@ -224,7 +244,7 @@
         <search-item>
           <el-input
             v-model.trim="listQuery.orderCode"
-            placeholder="委托书编号"
+            placeholder="委托单编号"
             class="short-input"
             clearable
           />
@@ -246,11 +266,9 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.deliverer"
-            placeholder="送样人"
-            class="short-input"
-            clearable
+          <el-date-picker
+            v-model="timeRange" type="daterange" range-separator="到" format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" start-placeholder="委托日期(开始)" end-placeholder="委托日期(结束)" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/measure/file/components/templateDetail.vue b/src/views/measure/file/components/templateDetail.vue
index 91615bc..5e0aebc 100644
--- a/src/views/measure/file/components/templateDetail.vue
+++ b/src/views/measure/file/components/templateDetail.vue
@@ -114,6 +114,7 @@
     ruleForm.minioFilePdfName = row.minioFilePdfName // pdf文件
     ruleForm.fileType = row.fileType // 文件类别
     ruleForm.fileTypeName = row.fileTypeName// 文件类别名称
+    console.log('-0-0-xiaqing', ruleForm.fileType, row)
   }
 }
 
@@ -147,14 +148,16 @@
             ruleForm.fileNo = res.data.fileNo
             ruleForm.id = res.data.id
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
         if (title.value === '编辑') {
           updateFile(ruleForm).then((res) => {
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index eea28d8..2852223 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="BusinessSettlementList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery, dictType } from './businessSettlement-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -19,6 +21,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 })
@@ -32,27 +36,29 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 }
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
-  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价(元)', value: 'postedPrice', align: 'center' },
-  { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
-  { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
+  { text: '样品库房', value: 'sampleWarehouse', align: 'center' },
+  { text: '证书库房', value: 'certWarehouse', align: 'center' },
+  { text: '费用状态', value: 'feeStatus', align: 'center' },
+  { text: '是否到账', value: 'received', align: 'center' },
+  { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
+  { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
+  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
+  { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -69,10 +75,7 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
-        totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
-        extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
-        postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
     total.value = parseInt(response.data.total)
@@ -93,9 +96,12 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
+    orderTimeStart: '', //	委托日期开始
+    orderTimeEnd: '', //	委托日期结束
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 
@@ -121,6 +127,8 @@
       customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       deliverer: listQuery.value.deliverer, // 送样人
+      orderTimeStart: listQuery.value.orderTimeStart, //	委托日期开始
+      orderTimeEnd: listQuery.value.orderTimeEnd, //	委托日期结束
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -210,6 +218,18 @@
   })
 }
 
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.orderTimeStart = `${val[0]}`
+    listQuery.value.orderTimeEnd = `${val[1]}`
+  }
+  else {
+    listQuery.value.orderTimeStart = ''
+    listQuery.value.orderTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict() // 获取字典
   fetchData(true) // 获取数据
@@ -224,7 +244,7 @@
         <search-item>
           <el-input
             v-model.trim="listQuery.orderCode"
-            placeholder="委托书编号"
+            placeholder="委托单编号"
             class="short-input"
             clearable
           />
@@ -246,11 +266,9 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.deliverer"
-            placeholder="送样人"
-            class="short-input"
-            clearable
+          <el-date-picker
+            v-model="timeRange" type="daterange" range-separator="到" format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" start-placeholder="委托日期(开始)" end-placeholder="委托日期(结束)" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/measure/file/components/templateDetail.vue b/src/views/measure/file/components/templateDetail.vue
index 91615bc..5e0aebc 100644
--- a/src/views/measure/file/components/templateDetail.vue
+++ b/src/views/measure/file/components/templateDetail.vue
@@ -114,6 +114,7 @@
     ruleForm.minioFilePdfName = row.minioFilePdfName // pdf文件
     ruleForm.fileType = row.fileType // 文件类别
     ruleForm.fileTypeName = row.fileTypeName// 文件类别名称
+    console.log('-0-0-xiaqing', ruleForm.fileType, row)
   }
 }
 
@@ -147,14 +148,16 @@
             ruleForm.fileNo = res.data.fileNo
             ruleForm.id = res.data.id
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
         if (title.value === '编辑') {
           updateFile(ruleForm).then((res) => {
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 536b828..f15f45e 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -147,7 +147,7 @@
     path: `/file/${props.authority}/detail`,
     query: {
       ...row,
-      fileType: searchQuery.fileType,
+      fileType: searchQuery.fileType || row.fileType,
       title: '详情',
       routerName: props.name,
     },

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index eea28d8..2852223 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="BusinessSettlementList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery, dictType } from './businessSettlement-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -19,6 +21,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 })
@@ -32,27 +36,29 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 }
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
-  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价(元)', value: 'postedPrice', align: 'center' },
-  { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
-  { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
+  { text: '样品库房', value: 'sampleWarehouse', align: 'center' },
+  { text: '证书库房', value: 'certWarehouse', align: 'center' },
+  { text: '费用状态', value: 'feeStatus', align: 'center' },
+  { text: '是否到账', value: 'received', align: 'center' },
+  { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
+  { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
+  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
+  { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -69,10 +75,7 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
-        totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
-        extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
-        postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
     total.value = parseInt(response.data.total)
@@ -93,9 +96,12 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
+    orderTimeStart: '', //	委托日期开始
+    orderTimeEnd: '', //	委托日期结束
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 
@@ -121,6 +127,8 @@
       customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       deliverer: listQuery.value.deliverer, // 送样人
+      orderTimeStart: listQuery.value.orderTimeStart, //	委托日期开始
+      orderTimeEnd: listQuery.value.orderTimeEnd, //	委托日期结束
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -210,6 +218,18 @@
   })
 }
 
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.orderTimeStart = `${val[0]}`
+    listQuery.value.orderTimeEnd = `${val[1]}`
+  }
+  else {
+    listQuery.value.orderTimeStart = ''
+    listQuery.value.orderTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict() // 获取字典
   fetchData(true) // 获取数据
@@ -224,7 +244,7 @@
         <search-item>
           <el-input
             v-model.trim="listQuery.orderCode"
-            placeholder="委托书编号"
+            placeholder="委托单编号"
             class="short-input"
             clearable
           />
@@ -246,11 +266,9 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.deliverer"
-            placeholder="送样人"
-            class="short-input"
-            clearable
+          <el-date-picker
+            v-model="timeRange" type="daterange" range-separator="到" format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" start-placeholder="委托日期(开始)" end-placeholder="委托日期(结束)" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/measure/file/components/templateDetail.vue b/src/views/measure/file/components/templateDetail.vue
index 91615bc..5e0aebc 100644
--- a/src/views/measure/file/components/templateDetail.vue
+++ b/src/views/measure/file/components/templateDetail.vue
@@ -114,6 +114,7 @@
     ruleForm.minioFilePdfName = row.minioFilePdfName // pdf文件
     ruleForm.fileType = row.fileType // 文件类别
     ruleForm.fileTypeName = row.fileTypeName// 文件类别名称
+    console.log('-0-0-xiaqing', ruleForm.fileType, row)
   }
 }
 
@@ -147,14 +148,16 @@
             ruleForm.fileNo = res.data.fileNo
             ruleForm.id = res.data.id
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
         if (title.value === '编辑') {
           updateFile(ruleForm).then((res) => {
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 536b828..f15f45e 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -147,7 +147,7 @@
     path: `/file/${props.authority}/detail`,
     query: {
       ...row,
-      fileType: searchQuery.fileType,
+      fileType: searchQuery.fileType || row.fileType,
       title: '详情',
       routerName: props.name,
     },
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
index db18a81..7718e76 100644
--- a/src/views/system/tool/certTempate/addDDialog.vue
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -1,19 +1,21 @@
 <!-- 证书模板管理详情弹窗 -->
 <script lang="ts" setup name="CertTempateDetail">
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { templateAdd, templateUpdate } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // 用户信息
 const emits = defineEmits(['resetData']); const user = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   templateNo: '', // 模板编号
   templateName: '', //  模板名称
-  model: '', // 型号规格
+  certificationType: '', // 模板类型
   templateCreator: '', // 负责人
   templateDesc: '', // 内容描述
   createTime: '', // 创建时间
@@ -21,16 +23,37 @@
   id: '',
 }) // 表单
 const title = ref('')
+const loading = ref(false)
 const rules = ref<FormRules>({
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
-  model: [{ required: true, message: '型号规格必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '模板类型必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '附件必填', trigger: 'blur' }],
   createTime: [{ required: true, message: '创建时间必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
+// ----------------------------------------字典---------------------------------------------
+const templateTypeList = ref<dictType[]>([]) // 模板类型
+const getDict = () => {
+  getDictByCode('certificationType').then((res) => {
+    templateTypeList.value = res.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+const clearForm = () => {
+  ruleForm.templateNo = '' // 模板编号
+  ruleForm.templateName = '' //  模板名称
+  ruleForm.certificationType = '' //  模板类型
+  ruleForm.templateCreator = '' //  负责人
+  ruleForm.templateDesc = '' //  内容描述
+  ruleForm.createTime = ''// 创建时间
+  ruleForm.minioFileName = '' // 附件
+}
+
 // 弹窗初始化
 const initDialog = (row: any) => {
+  clearForm()
   title.value = row.title as string
   ruleFormRef.value?.resetFields()
   dialogVisible.value = true
@@ -42,7 +65,7 @@
   else if (row.title === '编辑' || row.title === '详情') {
     ruleForm.templateNo = row.templateNo// 模板编号
     ruleForm.templateName = row.templateName//  模板名称
-    ruleForm.model = row.model//  型号规格
+    ruleForm.certificationType = row.certificationType//  模板类型
     ruleForm.templateCreator = row.templateCreator//  负责人
     ruleForm.templateDesc = row.templateDesc//  内容描述
     ruleForm.createTime = row.createTime// 创建时间
@@ -60,19 +83,22 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true
       if (title.value === '新增') {
-        templateAdd(ruleForm).then((res) => {
+        templateAdd({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
             close()
+            loading.value = false
           }
         })
       }
       else {
-        templateUpdate(ruleForm).then((res) => {
+        templateUpdate({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('更新成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -91,6 +117,10 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -100,6 +130,7 @@
       else {
         ElMessage.error(res.message)
       }
+      loading.close()
     })
   }
 }
@@ -111,7 +142,7 @@
 
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="65%" append-to-body class="container" @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
+    <el-form ref="ruleFormRef" v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="模板编号" prop="templateNo">
@@ -124,8 +155,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="型号规格" prop="model">
-            <el-input v-model.trim="ruleForm.model" :placeholder="title === '详情' ? ' ' : '型号规格'" :disabled="title === '详情'" />
+          <el-form-item label="模板类型" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              :disabled="title === '详情'"
+              :placeholder="title === '详情' ? ' ' : '请选择模板类型'"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in templateTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index eea28d8..2852223 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="BusinessSettlementList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery, dictType } from './businessSettlement-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -19,6 +21,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 })
@@ -32,27 +36,29 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 }
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
-  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价(元)', value: 'postedPrice', align: 'center' },
-  { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
-  { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
+  { text: '样品库房', value: 'sampleWarehouse', align: 'center' },
+  { text: '证书库房', value: 'certWarehouse', align: 'center' },
+  { text: '费用状态', value: 'feeStatus', align: 'center' },
+  { text: '是否到账', value: 'received', align: 'center' },
+  { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
+  { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
+  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
+  { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -69,10 +75,7 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
-        totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
-        extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
-        postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
     total.value = parseInt(response.data.total)
@@ -93,9 +96,12 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
+    orderTimeStart: '', //	委托日期开始
+    orderTimeEnd: '', //	委托日期结束
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 
@@ -121,6 +127,8 @@
       customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       deliverer: listQuery.value.deliverer, // 送样人
+      orderTimeStart: listQuery.value.orderTimeStart, //	委托日期开始
+      orderTimeEnd: listQuery.value.orderTimeEnd, //	委托日期结束
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -210,6 +218,18 @@
   })
 }
 
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.orderTimeStart = `${val[0]}`
+    listQuery.value.orderTimeEnd = `${val[1]}`
+  }
+  else {
+    listQuery.value.orderTimeStart = ''
+    listQuery.value.orderTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict() // 获取字典
   fetchData(true) // 获取数据
@@ -224,7 +244,7 @@
         <search-item>
           <el-input
             v-model.trim="listQuery.orderCode"
-            placeholder="委托书编号"
+            placeholder="委托单编号"
             class="short-input"
             clearable
           />
@@ -246,11 +266,9 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.deliverer"
-            placeholder="送样人"
-            class="short-input"
-            clearable
+          <el-date-picker
+            v-model="timeRange" type="daterange" range-separator="到" format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" start-placeholder="委托日期(开始)" end-placeholder="委托日期(结束)" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/measure/file/components/templateDetail.vue b/src/views/measure/file/components/templateDetail.vue
index 91615bc..5e0aebc 100644
--- a/src/views/measure/file/components/templateDetail.vue
+++ b/src/views/measure/file/components/templateDetail.vue
@@ -114,6 +114,7 @@
     ruleForm.minioFilePdfName = row.minioFilePdfName // pdf文件
     ruleForm.fileType = row.fileType // 文件类别
     ruleForm.fileTypeName = row.fileTypeName// 文件类别名称
+    console.log('-0-0-xiaqing', ruleForm.fileType, row)
   }
 }
 
@@ -147,14 +148,16 @@
             ruleForm.fileNo = res.data.fileNo
             ruleForm.id = res.data.id
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
         if (title.value === '编辑') {
           updateFile(ruleForm).then((res) => {
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 536b828..f15f45e 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -147,7 +147,7 @@
     path: `/file/${props.authority}/detail`,
     query: {
       ...row,
-      fileType: searchQuery.fileType,
+      fileType: searchQuery.fileType || row.fileType,
       title: '详情',
       routerName: props.name,
     },
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
index db18a81..7718e76 100644
--- a/src/views/system/tool/certTempate/addDDialog.vue
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -1,19 +1,21 @@
 <!-- 证书模板管理详情弹窗 -->
 <script lang="ts" setup name="CertTempateDetail">
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { templateAdd, templateUpdate } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // 用户信息
 const emits = defineEmits(['resetData']); const user = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   templateNo: '', // 模板编号
   templateName: '', //  模板名称
-  model: '', // 型号规格
+  certificationType: '', // 模板类型
   templateCreator: '', // 负责人
   templateDesc: '', // 内容描述
   createTime: '', // 创建时间
@@ -21,16 +23,37 @@
   id: '',
 }) // 表单
 const title = ref('')
+const loading = ref(false)
 const rules = ref<FormRules>({
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
-  model: [{ required: true, message: '型号规格必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '模板类型必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '附件必填', trigger: 'blur' }],
   createTime: [{ required: true, message: '创建时间必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
+// ----------------------------------------字典---------------------------------------------
+const templateTypeList = ref<dictType[]>([]) // 模板类型
+const getDict = () => {
+  getDictByCode('certificationType').then((res) => {
+    templateTypeList.value = res.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+const clearForm = () => {
+  ruleForm.templateNo = '' // 模板编号
+  ruleForm.templateName = '' //  模板名称
+  ruleForm.certificationType = '' //  模板类型
+  ruleForm.templateCreator = '' //  负责人
+  ruleForm.templateDesc = '' //  内容描述
+  ruleForm.createTime = ''// 创建时间
+  ruleForm.minioFileName = '' // 附件
+}
+
 // 弹窗初始化
 const initDialog = (row: any) => {
+  clearForm()
   title.value = row.title as string
   ruleFormRef.value?.resetFields()
   dialogVisible.value = true
@@ -42,7 +65,7 @@
   else if (row.title === '编辑' || row.title === '详情') {
     ruleForm.templateNo = row.templateNo// 模板编号
     ruleForm.templateName = row.templateName//  模板名称
-    ruleForm.model = row.model//  型号规格
+    ruleForm.certificationType = row.certificationType//  模板类型
     ruleForm.templateCreator = row.templateCreator//  负责人
     ruleForm.templateDesc = row.templateDesc//  内容描述
     ruleForm.createTime = row.createTime// 创建时间
@@ -60,19 +83,22 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true
       if (title.value === '新增') {
-        templateAdd(ruleForm).then((res) => {
+        templateAdd({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
             close()
+            loading.value = false
           }
         })
       }
       else {
-        templateUpdate(ruleForm).then((res) => {
+        templateUpdate({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('更新成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -91,6 +117,10 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -100,6 +130,7 @@
       else {
         ElMessage.error(res.message)
       }
+      loading.close()
     })
   }
 }
@@ -111,7 +142,7 @@
 
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="65%" append-to-body class="container" @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
+    <el-form ref="ruleFormRef" v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="模板编号" prop="templateNo">
@@ -124,8 +155,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="型号规格" prop="model">
-            <el-input v-model.trim="ruleForm.model" :placeholder="title === '详情' ? ' ' : '型号规格'" :disabled="title === '详情'" />
+          <el-form-item label="模板类型" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              :disabled="title === '详情'"
+              :placeholder="title === '详情' ? ' ' : '请选择模板类型'"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in templateTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
index 8192416..350c8a8 100644
--- a/src/views/system/tool/certTempate/list.vue
+++ b/src/views/system/tool/certTempate/list.vue
@@ -6,6 +6,8 @@
 import { getPhotoUrl, templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 import { download } from '@/utils/download'
 const createTime = ref()
 const searchQuery = reactive({
@@ -16,7 +18,7 @@
   createEndTime: '',
   limit: 20,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   ids: [] as string[],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
@@ -34,20 +36,35 @@
 const columns = ref<TableColumn[]>([
   { text: '编号', value: 'templateNo', align: 'center', width: '160' },
   { text: '模板名称', value: 'templateName', align: 'center' },
-  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
   { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '内容描述', value: 'templateDesc', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
-
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
+}
+// ---------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -174,7 +191,9 @@
   }
 }
 onMounted(() => {
-  getList()
+  getDict().then(() => {
+    getList()
+  })
 })
 </script>
 

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index eea28d8..2852223 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="BusinessSettlementList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery, dictType } from './businessSettlement-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -19,6 +21,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 })
@@ -32,27 +36,29 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 }
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
-  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价(元)', value: 'postedPrice', align: 'center' },
-  { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
-  { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
+  { text: '样品库房', value: 'sampleWarehouse', align: 'center' },
+  { text: '证书库房', value: 'certWarehouse', align: 'center' },
+  { text: '费用状态', value: 'feeStatus', align: 'center' },
+  { text: '是否到账', value: 'received', align: 'center' },
+  { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
+  { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
+  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
+  { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -69,10 +75,7 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
-        totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
-        extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
-        postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
     total.value = parseInt(response.data.total)
@@ -93,9 +96,12 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
+    orderTimeStart: '', //	委托日期开始
+    orderTimeEnd: '', //	委托日期结束
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 
@@ -121,6 +127,8 @@
       customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       deliverer: listQuery.value.deliverer, // 送样人
+      orderTimeStart: listQuery.value.orderTimeStart, //	委托日期开始
+      orderTimeEnd: listQuery.value.orderTimeEnd, //	委托日期结束
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -210,6 +218,18 @@
   })
 }
 
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.orderTimeStart = `${val[0]}`
+    listQuery.value.orderTimeEnd = `${val[1]}`
+  }
+  else {
+    listQuery.value.orderTimeStart = ''
+    listQuery.value.orderTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict() // 获取字典
   fetchData(true) // 获取数据
@@ -224,7 +244,7 @@
         <search-item>
           <el-input
             v-model.trim="listQuery.orderCode"
-            placeholder="委托书编号"
+            placeholder="委托单编号"
             class="short-input"
             clearable
           />
@@ -246,11 +266,9 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.deliverer"
-            placeholder="送样人"
-            class="short-input"
-            clearable
+          <el-date-picker
+            v-model="timeRange" type="daterange" range-separator="到" format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" start-placeholder="委托日期(开始)" end-placeholder="委托日期(结束)" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/measure/file/components/templateDetail.vue b/src/views/measure/file/components/templateDetail.vue
index 91615bc..5e0aebc 100644
--- a/src/views/measure/file/components/templateDetail.vue
+++ b/src/views/measure/file/components/templateDetail.vue
@@ -114,6 +114,7 @@
     ruleForm.minioFilePdfName = row.minioFilePdfName // pdf文件
     ruleForm.fileType = row.fileType // 文件类别
     ruleForm.fileTypeName = row.fileTypeName// 文件类别名称
+    console.log('-0-0-xiaqing', ruleForm.fileType, row)
   }
 }
 
@@ -147,14 +148,16 @@
             ruleForm.fileNo = res.data.fileNo
             ruleForm.id = res.data.id
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
         if (title.value === '编辑') {
           updateFile(ruleForm).then((res) => {
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 536b828..f15f45e 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -147,7 +147,7 @@
     path: `/file/${props.authority}/detail`,
     query: {
       ...row,
-      fileType: searchQuery.fileType,
+      fileType: searchQuery.fileType || row.fileType,
       title: '详情',
       routerName: props.name,
     },
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
index db18a81..7718e76 100644
--- a/src/views/system/tool/certTempate/addDDialog.vue
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -1,19 +1,21 @@
 <!-- 证书模板管理详情弹窗 -->
 <script lang="ts" setup name="CertTempateDetail">
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { templateAdd, templateUpdate } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // 用户信息
 const emits = defineEmits(['resetData']); const user = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   templateNo: '', // 模板编号
   templateName: '', //  模板名称
-  model: '', // 型号规格
+  certificationType: '', // 模板类型
   templateCreator: '', // 负责人
   templateDesc: '', // 内容描述
   createTime: '', // 创建时间
@@ -21,16 +23,37 @@
   id: '',
 }) // 表单
 const title = ref('')
+const loading = ref(false)
 const rules = ref<FormRules>({
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
-  model: [{ required: true, message: '型号规格必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '模板类型必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '附件必填', trigger: 'blur' }],
   createTime: [{ required: true, message: '创建时间必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
+// ----------------------------------------字典---------------------------------------------
+const templateTypeList = ref<dictType[]>([]) // 模板类型
+const getDict = () => {
+  getDictByCode('certificationType').then((res) => {
+    templateTypeList.value = res.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+const clearForm = () => {
+  ruleForm.templateNo = '' // 模板编号
+  ruleForm.templateName = '' //  模板名称
+  ruleForm.certificationType = '' //  模板类型
+  ruleForm.templateCreator = '' //  负责人
+  ruleForm.templateDesc = '' //  内容描述
+  ruleForm.createTime = ''// 创建时间
+  ruleForm.minioFileName = '' // 附件
+}
+
 // 弹窗初始化
 const initDialog = (row: any) => {
+  clearForm()
   title.value = row.title as string
   ruleFormRef.value?.resetFields()
   dialogVisible.value = true
@@ -42,7 +65,7 @@
   else if (row.title === '编辑' || row.title === '详情') {
     ruleForm.templateNo = row.templateNo// 模板编号
     ruleForm.templateName = row.templateName//  模板名称
-    ruleForm.model = row.model//  型号规格
+    ruleForm.certificationType = row.certificationType//  模板类型
     ruleForm.templateCreator = row.templateCreator//  负责人
     ruleForm.templateDesc = row.templateDesc//  内容描述
     ruleForm.createTime = row.createTime// 创建时间
@@ -60,19 +83,22 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true
       if (title.value === '新增') {
-        templateAdd(ruleForm).then((res) => {
+        templateAdd({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
             close()
+            loading.value = false
           }
         })
       }
       else {
-        templateUpdate(ruleForm).then((res) => {
+        templateUpdate({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('更新成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -91,6 +117,10 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -100,6 +130,7 @@
       else {
         ElMessage.error(res.message)
       }
+      loading.close()
     })
   }
 }
@@ -111,7 +142,7 @@
 
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="65%" append-to-body class="container" @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
+    <el-form ref="ruleFormRef" v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="模板编号" prop="templateNo">
@@ -124,8 +155,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="型号规格" prop="model">
-            <el-input v-model.trim="ruleForm.model" :placeholder="title === '详情' ? ' ' : '型号规格'" :disabled="title === '详情'" />
+          <el-form-item label="模板类型" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              :disabled="title === '详情'"
+              :placeholder="title === '详情' ? ' ' : '请选择模板类型'"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in templateTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
index 8192416..350c8a8 100644
--- a/src/views/system/tool/certTempate/list.vue
+++ b/src/views/system/tool/certTempate/list.vue
@@ -6,6 +6,8 @@
 import { getPhotoUrl, templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 import { download } from '@/utils/download'
 const createTime = ref()
 const searchQuery = reactive({
@@ -16,7 +18,7 @@
   createEndTime: '',
   limit: 20,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   ids: [] as string[],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
@@ -34,20 +36,35 @@
 const columns = ref<TableColumn[]>([
   { text: '编号', value: 'templateNo', align: 'center', width: '160' },
   { text: '模板名称', value: 'templateName', align: 'center' },
-  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
   { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '内容描述', value: 'templateDesc', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
-
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
+}
+// ---------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -174,7 +191,9 @@
   }
 }
 onMounted(() => {
-  getList()
+  getDict().then(() => {
+    getList()
+  })
 })
 </script>
 
diff --git a/src/views/system/tool/fileTemplate/addDDialog.vue b/src/views/system/tool/fileTemplate/addDDialog.vue
index 1ff8ac0..6cba8a4 100644
--- a/src/views/system/tool/fileTemplate/addDDialog.vue
+++ b/src/views/system/tool/fileTemplate/addDDialog.vue
@@ -1,7 +1,7 @@
 <!-- 文件模板管理详情弹窗 -->
 <script lang="ts" setup name="FileTempateDetail">
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
@@ -12,6 +12,7 @@
 // 用户信息
 const emits = defineEmits(['resetData'])
 const user = useUserStore()
+const loading = ref(false)
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   templateNo: '', // 模板编号
@@ -42,8 +43,19 @@
 }
 getDict()
 // -------------------------------------------------------------------------------------------
+const clearForm = () => {
+  ruleForm.templateNo = ''// 模板编号
+  ruleForm.templateName = ''//  模板名称
+  ruleForm.templateCreator = ''// 负责人
+  ruleForm.templateDesc = ''// 内容描述
+  ruleForm.createTime = ''// 创建时间
+  ruleForm.minioFileName = ''// 附件
+  ruleForm.templateType = ''// 模板类型
+}
+
 // 弹窗初始化
 const initDialog = (row: any) => {
+  clearForm()
   title.value = row.title as string
   ruleFormRef.value?.resetFields()
   dialogVisible.value = true
@@ -73,11 +85,13 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true
       if (title.value === '新增') {
         templateAdd(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -86,6 +100,7 @@
           if (res.code === 200) {
             ElMessage.success('更新成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -104,6 +119,10 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -113,6 +132,7 @@
       else {
         ElMessage.error(res.message)
       }
+      loading.close()
     })
   }
 }
@@ -124,7 +144,7 @@
 
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="65%" append-to-body class="container" @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
+    <el-form ref="ruleFormRef" v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="模板编号" prop="templateNo">

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index eea28d8..2852223 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="BusinessSettlementList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery, dictType } from './businessSettlement-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -19,6 +21,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 })
@@ -32,27 +36,29 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 }
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
-  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价(元)', value: 'postedPrice', align: 'center' },
-  { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
-  { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
+  { text: '样品库房', value: 'sampleWarehouse', align: 'center' },
+  { text: '证书库房', value: 'certWarehouse', align: 'center' },
+  { text: '费用状态', value: 'feeStatus', align: 'center' },
+  { text: '是否到账', value: 'received', align: 'center' },
+  { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
+  { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
+  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
+  { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -69,10 +75,7 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
-        totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
-        extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
-        postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
     total.value = parseInt(response.data.total)
@@ -93,9 +96,12 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
+    orderTimeStart: '', //	委托日期开始
+    orderTimeEnd: '', //	委托日期结束
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 
@@ -121,6 +127,8 @@
       customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       deliverer: listQuery.value.deliverer, // 送样人
+      orderTimeStart: listQuery.value.orderTimeStart, //	委托日期开始
+      orderTimeEnd: listQuery.value.orderTimeEnd, //	委托日期结束
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -210,6 +218,18 @@
   })
 }
 
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.orderTimeStart = `${val[0]}`
+    listQuery.value.orderTimeEnd = `${val[1]}`
+  }
+  else {
+    listQuery.value.orderTimeStart = ''
+    listQuery.value.orderTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict() // 获取字典
   fetchData(true) // 获取数据
@@ -224,7 +244,7 @@
         <search-item>
           <el-input
             v-model.trim="listQuery.orderCode"
-            placeholder="委托书编号"
+            placeholder="委托单编号"
             class="short-input"
             clearable
           />
@@ -246,11 +266,9 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.deliverer"
-            placeholder="送样人"
-            class="short-input"
-            clearable
+          <el-date-picker
+            v-model="timeRange" type="daterange" range-separator="到" format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" start-placeholder="委托日期(开始)" end-placeholder="委托日期(结束)" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/measure/file/components/templateDetail.vue b/src/views/measure/file/components/templateDetail.vue
index 91615bc..5e0aebc 100644
--- a/src/views/measure/file/components/templateDetail.vue
+++ b/src/views/measure/file/components/templateDetail.vue
@@ -114,6 +114,7 @@
     ruleForm.minioFilePdfName = row.minioFilePdfName // pdf文件
     ruleForm.fileType = row.fileType // 文件类别
     ruleForm.fileTypeName = row.fileTypeName// 文件类别名称
+    console.log('-0-0-xiaqing', ruleForm.fileType, row)
   }
 }
 
@@ -147,14 +148,16 @@
             ruleForm.fileNo = res.data.fileNo
             ruleForm.id = res.data.id
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
         if (title.value === '编辑') {
           updateFile(ruleForm).then((res) => {
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 536b828..f15f45e 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -147,7 +147,7 @@
     path: `/file/${props.authority}/detail`,
     query: {
       ...row,
-      fileType: searchQuery.fileType,
+      fileType: searchQuery.fileType || row.fileType,
       title: '详情',
       routerName: props.name,
     },
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
index db18a81..7718e76 100644
--- a/src/views/system/tool/certTempate/addDDialog.vue
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -1,19 +1,21 @@
 <!-- 证书模板管理详情弹窗 -->
 <script lang="ts" setup name="CertTempateDetail">
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { templateAdd, templateUpdate } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // 用户信息
 const emits = defineEmits(['resetData']); const user = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   templateNo: '', // 模板编号
   templateName: '', //  模板名称
-  model: '', // 型号规格
+  certificationType: '', // 模板类型
   templateCreator: '', // 负责人
   templateDesc: '', // 内容描述
   createTime: '', // 创建时间
@@ -21,16 +23,37 @@
   id: '',
 }) // 表单
 const title = ref('')
+const loading = ref(false)
 const rules = ref<FormRules>({
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
-  model: [{ required: true, message: '型号规格必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '模板类型必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '附件必填', trigger: 'blur' }],
   createTime: [{ required: true, message: '创建时间必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
+// ----------------------------------------字典---------------------------------------------
+const templateTypeList = ref<dictType[]>([]) // 模板类型
+const getDict = () => {
+  getDictByCode('certificationType').then((res) => {
+    templateTypeList.value = res.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+const clearForm = () => {
+  ruleForm.templateNo = '' // 模板编号
+  ruleForm.templateName = '' //  模板名称
+  ruleForm.certificationType = '' //  模板类型
+  ruleForm.templateCreator = '' //  负责人
+  ruleForm.templateDesc = '' //  内容描述
+  ruleForm.createTime = ''// 创建时间
+  ruleForm.minioFileName = '' // 附件
+}
+
 // 弹窗初始化
 const initDialog = (row: any) => {
+  clearForm()
   title.value = row.title as string
   ruleFormRef.value?.resetFields()
   dialogVisible.value = true
@@ -42,7 +65,7 @@
   else if (row.title === '编辑' || row.title === '详情') {
     ruleForm.templateNo = row.templateNo// 模板编号
     ruleForm.templateName = row.templateName//  模板名称
-    ruleForm.model = row.model//  型号规格
+    ruleForm.certificationType = row.certificationType//  模板类型
     ruleForm.templateCreator = row.templateCreator//  负责人
     ruleForm.templateDesc = row.templateDesc//  内容描述
     ruleForm.createTime = row.createTime// 创建时间
@@ -60,19 +83,22 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true
       if (title.value === '新增') {
-        templateAdd(ruleForm).then((res) => {
+        templateAdd({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
             close()
+            loading.value = false
           }
         })
       }
       else {
-        templateUpdate(ruleForm).then((res) => {
+        templateUpdate({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('更新成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -91,6 +117,10 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -100,6 +130,7 @@
       else {
         ElMessage.error(res.message)
       }
+      loading.close()
     })
   }
 }
@@ -111,7 +142,7 @@
 
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="65%" append-to-body class="container" @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
+    <el-form ref="ruleFormRef" v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="模板编号" prop="templateNo">
@@ -124,8 +155,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="型号规格" prop="model">
-            <el-input v-model.trim="ruleForm.model" :placeholder="title === '详情' ? ' ' : '型号规格'" :disabled="title === '详情'" />
+          <el-form-item label="模板类型" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              :disabled="title === '详情'"
+              :placeholder="title === '详情' ? ' ' : '请选择模板类型'"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in templateTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
index 8192416..350c8a8 100644
--- a/src/views/system/tool/certTempate/list.vue
+++ b/src/views/system/tool/certTempate/list.vue
@@ -6,6 +6,8 @@
 import { getPhotoUrl, templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 import { download } from '@/utils/download'
 const createTime = ref()
 const searchQuery = reactive({
@@ -16,7 +18,7 @@
   createEndTime: '',
   limit: 20,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   ids: [] as string[],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
@@ -34,20 +36,35 @@
 const columns = ref<TableColumn[]>([
   { text: '编号', value: 'templateNo', align: 'center', width: '160' },
   { text: '模板名称', value: 'templateName', align: 'center' },
-  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
   { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '内容描述', value: 'templateDesc', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
-
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
+}
+// ---------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -174,7 +191,9 @@
   }
 }
 onMounted(() => {
-  getList()
+  getDict().then(() => {
+    getList()
+  })
 })
 </script>
 
diff --git a/src/views/system/tool/fileTemplate/addDDialog.vue b/src/views/system/tool/fileTemplate/addDDialog.vue
index 1ff8ac0..6cba8a4 100644
--- a/src/views/system/tool/fileTemplate/addDDialog.vue
+++ b/src/views/system/tool/fileTemplate/addDDialog.vue
@@ -1,7 +1,7 @@
 <!-- 文件模板管理详情弹窗 -->
 <script lang="ts" setup name="FileTempateDetail">
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
@@ -12,6 +12,7 @@
 // 用户信息
 const emits = defineEmits(['resetData'])
 const user = useUserStore()
+const loading = ref(false)
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   templateNo: '', // 模板编号
@@ -42,8 +43,19 @@
 }
 getDict()
 // -------------------------------------------------------------------------------------------
+const clearForm = () => {
+  ruleForm.templateNo = ''// 模板编号
+  ruleForm.templateName = ''//  模板名称
+  ruleForm.templateCreator = ''// 负责人
+  ruleForm.templateDesc = ''// 内容描述
+  ruleForm.createTime = ''// 创建时间
+  ruleForm.minioFileName = ''// 附件
+  ruleForm.templateType = ''// 模板类型
+}
+
 // 弹窗初始化
 const initDialog = (row: any) => {
+  clearForm()
   title.value = row.title as string
   ruleFormRef.value?.resetFields()
   dialogVisible.value = true
@@ -73,11 +85,13 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true
       if (title.value === '新增') {
         templateAdd(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -86,6 +100,7 @@
           if (res.code === 200) {
             ElMessage.success('更新成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -104,6 +119,10 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -113,6 +132,7 @@
       else {
         ElMessage.error(res.message)
       }
+      loading.close()
     })
   }
 }
@@ -124,7 +144,7 @@
 
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="65%" append-to-body class="container" @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
+    <el-form ref="ruleFormRef" v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="模板编号" prop="templateNo">
diff --git a/src/views/system/tool/fileTemplate/list.vue b/src/views/system/tool/fileTemplate/list.vue
index c5ee694..a7a6290 100644
--- a/src/views/system/tool/fileTemplate/list.vue
+++ b/src/views/system/tool/fileTemplate/list.vue
@@ -18,7 +18,7 @@
   createEndTime: '',
   limit: 20,
   offset: 1,
-  templateType: '',
+  templateType: '0',
   ids: [] as string[],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {

diff --git a/src/api/business/lab/measureData.ts b/src/api/business/lab/measureData.ts
new file mode 100644
index 0000000..ab3a56e
--- /dev/null
+++ b/src/api/business/lab/measureData.ts
@@ -0,0 +1,78 @@
+/**
+ * 计量数据管理
+*/
+import request from '../../index'
+
+// 计量数据管理列表
+export function getMeasureDataList(data: { offset: number; limit: number }) {
+  return request({
+    url: `/business/certificateReport/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击下载模板后生成证书
+export function downLoadTemplate(data: any) {
+  return request({
+    url: '/business/certificateReport/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+
+// 新增
+export function addMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱更新
+export function draftUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: string; processId?: string; id: string }) {
+  return request({
+    url: '/business/certificateReport/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getMeasureDataDetail(data: { id: string }) {
+  return request({
+    url: '/business/certificateReport/detail',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function deleteMeasureData(data: any) {
+  return request({
+    url: '/business/certificateReport/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index ad17a5a..c778f8e 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -94,3 +94,4 @@
     data,
   })
 }
+
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6b2f5f2..8223e4c 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -67,19 +67,10 @@
     data,
   })
 }
-// 原始记录模板/证书报告模板列表（分页）
-export interface listParamsType {
-  templateNo: string // 编号
-  templateName: string // 名称
-  templateCreator: string // 负责人
-  // createTime: string // 创建时间
-  limit: number
-  offset: number
-  templateType: string
-}
-export function templatePage(data: listParamsType) {
+
+export function templatePage(data: any) {
   return request({
-    url: `${prefix}/template/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}template/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
@@ -87,7 +78,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/detail`,
+    url: `${prefix}template/detail`,
     method: 'post',
     data,
   })
@@ -95,7 +86,7 @@
 // 原始记录模板/证书报告模板列表删除
 export function templateDelete(data: object) {
   return request({
-    url: `${prefix}/template/delete`,
+    url: `${prefix}template/delete`,
     method: 'post',
     data,
   })
@@ -103,7 +94,7 @@
 // 原始记录模板/证书报告模板列表新建
 export function templateAdd(data: object) {
   return request({
-    url: `${prefix}/template/add`,
+    url: `${prefix}template/add`,
     method: 'post',
     data,
   })
@@ -111,7 +102,7 @@
 // 原始记录模板/证书报告模板列表更新
 export function templateUpdate(data: object) {
   return request({
-    url: `${prefix}/template/update`,
+    url: `${prefix}template/update`,
     method: 'post',
     data,
   })
@@ -119,7 +110,7 @@
 // 原始记录模板/证书报告模板列表导出
 export function templateExport(data: object) {
   return request({
-    url: `${prefix}/template/listExport`,
+    url: `${prefix}template/listExport`,
     method: 'post',
     data,
     responseType: 'blob',
diff --git a/src/components.d.ts b/src/components.d.ts
index edc2e04..64cf608 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -46,6 +46,7 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
+    MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -67,6 +68,7 @@
     SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
+    TableColumn: typeof import('./components/MultiHeaderTable/tableColumn.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
     WordOreview: typeof import('./components/filePreview/wordOreview.vue')['default']
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
new file mode 100644
index 0000000..85b8c88
--- /dev/null
+++ b/src/components/MultiHeaderTable/index.vue
@@ -0,0 +1,343 @@
+<script lang="ts" setup name="MultiHeaderTableIndex">
+import TableColumn from './tableColumn.vue'
+const props = defineProps({
+  // 表格的数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 多级表头的数据
+  tableHeader: {
+    type: Array as any,
+    default: () => [],
+  },
+  // 是否需要多选
+  multiSelected: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示 总计行
+  showSummary: {
+    type: Boolean,
+    default: false,
+  },
+  // 设置Table的最大高度
+  maxHeight: {
+    type: String,
+    default: 'auto',
+    // default: '400',
+  },
+  height: {
+    type: String,
+    // default: 'auto',
+    // default: '300',
+  },
+  width: {
+    type: String,
+    defualt: '100%',
+  },
+  // 集合中的指定列有重复的值合并
+  mergeRows: {
+    type: Array,
+    default: () => [],
+  },
+  // 是否单选
+  highlightCurrentRow: {
+    type: Boolean,
+    default: false,
+  },
+  // inputNumber最小数量
+  min: {
+    type: Number,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+  needIndex: { // 为否需要序号
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleSelectionChange',
+  'rowClick',
+  'dbclick',
+  'row-dbclick',
+  'cellDblclick',
+  'cellClick',
+  'rowContextmenu',
+  'headerClick',
+  'headerContextmenu',
+  'handleCurrentChange',
+  'handleInputNumberChange',
+  'handleClickHeader',
+  'selectChange',
+])
+
+const tableList = ref([]) // 处理后的table数据
+// 多选数组集合
+const multipleSelection = ref([])
+// 监听
+watch(() => props.tableData, (newValue) => {
+  if (newValue && newValue?.length) {
+    if (Array.isArray(newValue) && newValue?.length) {
+      const data = newValue[newValue.length - 1]
+    }
+    init(newValue)
+    // useMergeTableRow(newValue, props.mergeRows)
+  }
+}, { deep: true, immediate: true })
+
+function init(val: any) {
+  // 对数据合并指定行处理
+  mergeTableRowMethod(val, props.mergeRows) // 意思是name的列有重复的值就要合并
+}
+// 多选方法
+function handleSelectionChange(val: any) {
+  multipleSelection.value = val
+  emits('handleSelectionChange', val)
+}
+// 手动勾选数据行的checkBox会触发
+function handleSelect(val: any, row: any) {
+  console.log('手动勾选触发')
+  console.log(val, row)
+}
+// elementUI的合并行方法
+function mergeTableRow({ row, column, rowIndex, columnIndex }: any) {
+  // console.log(row, column, rowIndex, columnIndex);
+  const span = `${column.property}-span`
+  if (row[span]) {
+    return row[span]
+  }
+}
+// 封装合并指定行逻辑
+function mergeTableRowMethod(data: any, merge: any) {
+  if (!merge || merge.length === 0) {
+    tableList.value = data
+  }
+  merge.forEach((m: any) => {
+    const mList = {} as any
+    data = data.map((v: any, index: number) => {
+      const rowVal = v[m]
+      if (mList[rowVal] && mList[rowVal].newIndex === index) {
+        mList[rowVal].num++
+        mList[rowVal].newIndex++
+        data[mList[rowVal].index][`${m}-span`].rowspan++
+        v[`${m}-span`] = {
+          rowspan: 0,
+          colspan: 0,
+        }
+      }
+      else {
+        mList[rowVal] = { num: 1, index, newIndex: index + 1 }
+        v[`${m}-span`] = {
+          rowspan: 1,
+          colspan: 1,
+        }
+      }
+      return v
+    })
+  })
+  tableList.value = data
+}
+
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function rowClick(row: any, column: any) {
+  emits('rowClick', row, column)
+}
+function rowDoubleClick(row: any, column: any) {
+  console.log('dbclick')
+  emits('dbclick', row, column)
+}
+function cellDblclick(row: any, column: any, cell: any, event: any) {
+  emits('cellDblclick', row, column, cell, event)
+}
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emits('cellClick', row, column, cell, event)
+}
+function rowContextmenu(row: any, column: any) {
+  emits('rowContextmenu', row, column)
+}
+// 当某一列的表头被点击时会触发该事件
+function headerClick(column: any) {
+  emits('headerClick', column)
+}
+// 当某一列的表头被鼠标右键点击时触发该事件
+function headerContextmenu(column: any) {
+  emits('headerContextmenu', column)
+}
+function currentChange(currentRow: any) {
+  emits('handleCurrentChange', currentRow)
+}
+function handleInputNumberChange(currentRow: any) {
+  emits('handleInputNumberChange', currentRow)
+}
+// 监听点击多级表头事件（此事件在子组件重触发）
+function handleClickHeader(column: any, checkDateDetailId: string) {
+  emits('handleClickHeader', column, checkDateDetailId)
+}
+
+// select选择器选中值变化
+function selectChange(value: any, row: any) {
+  emits('selectChange', value, row)
+}
+</script>
+
+<template>
+  <div class="multi-header-table">
+    <el-table
+      ref="csTable"
+      :data="tableList"
+      :max-height="maxHeight"
+      :span-method="mergeTableRow"
+      :show-summary="showSummary"
+      :highlight-current-row="highlightCurrentRow"
+      stripe
+      @selection-change="handleSelectionChange"
+      @current-change="currentChange"
+      @row-click="rowClick"
+      @row-dblclick="rowDoubleClick"
+      @cell-dblclick="cellDblclick"
+      @cell-click="cellClick"
+      @select="handleSelect"
+      @row-contextmenu="rowContextmenu"
+      @header-click="headerClick"
+      @header-contextmenu="headerContextmenu"
+    >
+      <!-- @cell-dblclick="handleTableCellClick" -->
+      <el-table-column v-if="needIndex" label="序号" align="center" type="index" width="55" />
+      <el-table-column v-if="multiSelected" type="selection" width="85" />
+      <!-- 需要加在表最前方的插槽 -->
+      <slot name="preColumns" />
+      <template v-for="(item, index) in tableHeader">
+        <table-column
+          v-if="item.children && item.children.length"
+          :key="item.id"
+          :width="item.width"
+          :coloumn-header="item"
+          :min="min"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+          @handle-input-number-change="handleInputNumberChange"
+          @handleClickHeader="handleClickHeader"
+        />
+        <!-- icon类型 -->
+        <el-table-column
+          v-else-if="item.type === 'icon'"
+          :key="`c_${index}`"
+          :label="item.text"
+          :prop="item.value"
+          :width="item.width"
+          :fixed="item.fixed"
+        >
+          <template #default="scope">
+            <i
+              :class="item.icon"
+              :style="{ color: item.colorList[parseInt(scope.row[item.value])], fontSize: item.size }"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+          :align="item.align"
+          :show-overflow-tooltip="showOverflowTooltip"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-select
+              v-if="item.type === 'select' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              placeholder="请选择"
+              @change="(value) => selectChange(value, scope.row)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.value"
+                :label="opt.text"
+                :value="opt.value"
+              />
+            </el-select>
+            <el-date-picker
+              v-else-if="item.type === 'date' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              type="date"
+              style="width: 100%;"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+            <el-input
+              v-else-if="item.type === 'input' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              @change="handleInputChange(scope)"
+              @blur="handleInputBlur(scope.row)"
+            />
+            <!-- <precision-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              :min="min"
+            /> -->
+            <el-input-number
+              v-else-if="item.type === 'inputNumber' && scope.row.editable "
+              v-model="scope.row[item.value]"
+              :precision="item.precision"
+              :min="min"
+            />
+
+            <template v-else-if="item.type === 'text'">
+              <span>{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <template v-else>
+              <span v-show="!scope.row.editable">{{ scope.row[item.value] }}
+              </span>
+            </template>
+            <!-- 单位 -->
+            <template v-if="scope.row[item.value] && item.unit">
+              {{ scope.row[item.unit] }}
+            </template>
+            <span v-show="scope.row.exceedMark === 1 && item.needMark" style="color: red;">*</span>
+          </template>
+        </el-table-column>
+      </template>
+      <!-- 自定义的放这里 -->
+      <slot name="columns" />
+    </el-table>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.multi-header-table {
+  width: 100%;
+  // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    // display: none;
+  }
+
+  :deep(.el-table thead.is-group th.el-table__cell) {
+    background: #f2f6ff;
+  }
+}
+
+.single-table {
+  width: 100%;
+
+  :deep(.el-table th.el-table__cell:nth-child(1) .cell) {
+    visibility: hidden;
+  }
+}
+</style>
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
new file mode 100644
index 0000000..2b87285
--- /dev/null
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup name="TableColumn">
+const props = defineProps({
+  coloumnHeader: { // 表头
+    type: Object,
+    required: true,
+  },
+  min: {
+    type: Number,
+    default: undefined,
+  },
+  width: {
+    type: String,
+  },
+  showOverflowTooltip: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits([
+  'handleInputChange',
+  'handleInputBlur',
+  'handleInputNumberChange',
+  'handleClickHeader',
+])
+function handleInputChange(val: any) {
+  console.log(val, 'handleInputChange')
+}
+function handleInputBlur(row: any) {
+  console.log(row, 'handleInputBlur')
+}
+function handleInputNumberChange(val: any) {
+  emits('handleInputNumberChange', val)
+}
+// 点击表头
+function clickHeader(val: any, checkDateDetailId: string) {
+  emits('handleClickHeader', val, checkDateDetailId)
+}
+</script>
+
+<template>
+  <el-table-column :label="coloumnHeader.text" :prop="coloumnHeader.value">
+    <template v-for="item in coloumnHeader.children">
+      <table-column
+        v-if="item.children && item.children.length"
+        :key="item.id"
+        :coloumn-header="item"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      />
+      <el-table-column
+        v-else
+        :key="item.name"
+        :label="item.text"
+        :prop="item.value"
+        :width="item.width"
+        :align="item.align"
+        :show-overflow-tooltip="showOverflowTooltip"
+      >
+        <template #header="scope">
+          <!-- 稳定性表头处理 -->
+          <el-link v-if="item.customHeader && item.text !== '-' && item.checkDateDetailId" :underline="false" style="color: #3d7eff;font-weight: 600;" @click="clickHeader(scope.column, item.checkDateDetailId)">
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </el-link>
+          <div v-else>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </div>
+        </template>
+        <template #default="scope">
+          <el-select
+            v-if="item.type === 'select' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="opt in item.options"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="item.type === 'date' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            type="date"
+            style="width: 100%;"
+            placeholder="选择日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input
+            v-else-if="item.type === 'input' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            @change="handleInputChange(scope)"
+            @blur="handleInputBlur(scope.row)"
+          />
+          <scientific-notation
+            v-else-if="item.type === 'notation' && scope.row.editable"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            style="width: 100%;"
+            :number-digit="item.numberDigit || ''"
+            :notation-digit="item.notationDigit || '2'"
+            @change="handleInputNumberChange(scope)"
+          />
+          <el-input-number
+            v-else-if="item.type === 'inputNumber' && scope.row.editable "
+            v-model="scope.row[item.value]"
+            :precision="item.precision"
+            :min="min"
+            @change="handleInputNumberChange(scope)"
+          />
+          <!-- <div v-else-if="item.type === 'inputNumber'" style="display: flex; justify-content: center; align-items: center;">
+            <el-input-number
+              v-if="scope.row.editable && item.useElInputNumber === 'true'"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <precision-input-number
+              v-if="scope.row.editable && (item.useElInputNumber !== 'true' || !item.useElInputNumber)"
+              v-model="scope.row[item.value]"
+              :precision="item.precision || scope.row.useRowPrecisionData || scope.row.validDigit"
+              placeholder="请输入"
+              :min="min"
+              :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined"
+              @change="handleInputNumberChange(scope)"
+            />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <span v-if="item.showUnit" style="white-space: nowrap;">{{ scope.row.showUnitData }}</span>
+          </div> -->
+          <template v-else-if="item.type === 'text'">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+          <template v-else>
+            <span v-show="!scope.row.editable">{{
+              scope.row[item.value]
+            }}</span>
+          </template>
+        </template>
+      </el-table-column>
+    </template>
+  </el-table-column>
+</template>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e56f775..67092d3 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -3,6 +3,7 @@
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
 import type { TableColumn } from './table_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 // ------------------定义props、 emit-------------------
 const props = defineProps({
@@ -212,8 +213,8 @@
           <span v-if="!column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-if="column.filter && !column.isLink" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
           <div v-if="column.isLink">
-            {{ scope.row }}
-            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
+            <!-- {{ scope.row.fileArr }} -->
+            <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" />
           </div>
           <div v-if="column.followLink">
             <div v-for="(item, index) in scope.row.followLinkArr" :key="index" @click="handleClickFollowLink(scope.row, item)">
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,73 @@
+import { ElMessage } from 'element-plus'
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据（被依赖项如果满足某个条件就去检查依赖项，否则不检查依赖项）
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ * @param depend // 依赖项
+ * @param depended // 被依赖项
+ * @param dependedValue // 被依赖项条件
+ * @param requireLength // 要检查的表格数据长度是否大于0
+ */
+export default function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
+  for (const prop of columns) {
+    for (let index = 0; index < list.length; index++) {
+      const item = list[index]
+
+      if (depend && depended && item[depended] === dependedValue && !(`${item[prop.value]}`)) { // 被依赖项满足条件时需要检查
+        ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+        return false
+      }
+      else {
+        // 检查必填
+        if (prop.required && (!(`${item[prop.value]}`) || `${item[prop.value]}` === 'null' || `${item[prop.value]}` === 'undefined' || item[prop.value] == undefined)) {
+          if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为空`)
+          }
+          else {
+            ElMessage.warning(`请先完善 ${tableTitle} 第${index + 1}行中 ${prop.text} 字段`)
+          }
+          return false
+        }
+      }
+
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (prop.value === 'resolution') { // 分辨力特殊处理
+          if (!prop.reg(item[prop.value])) {
+            ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  不能大于1`)
+            return false
+          }
+        }
+        else {
+          if (!prop.reg(item[prop.value])) {
+            if (`${prop.belongStandardEquipment}` === '15') { // 小功率
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.message} ${prop.text} 字段不能为0`)
+            }
+            else if (`${prop.belongStandardEquipment}` === '17') { // S参数
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text} 仅允许输入数字、字母、特殊字符`)
+            }
+            else {
+              ElMessage.warning(`${tableTitle} 第${index + 1}行中 ${prop.text}  字段输入不合法`)
+            }
+            return false
+          }
+        }
+      }
+
+      if (prop.children && prop.children.length) {
+        if (!useCheckList(list, prop.children, tableTitle, depend, depended, dependedValue)) {
+          return false
+        }
+      }
+    }
+  }
+
+  if (requireLength && !list.length) {
+    ElMessage.warning(`${tableTitle}表格数据不能为空`)
+    return false
+  }
+  return true
+}
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index 4002f83..b004107 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
@@ -60,9 +61,10 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string) => {
+const initDialog = (orderIdParam: string, isMultiParam = true) => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
+  isMulti.value = isMultiParam
   getList()
 }
 defineExpose({ initDialog })
@@ -78,7 +80,7 @@
         :columns="columns"
         is-showmulti-select
         :list-loading="loadingTable"
-        :is-multi="true"
+        :is-multi="isMulti"
         :height="300"
         :pagination="false"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 5c59693..ec36ef7 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -7,8 +7,9 @@
 import type { typeofSign } from '@/views/system/tool/tool_interface'
 import { templatePage } from '@/api/system/tool'
 
-const emits = defineEmits(['add'])
+const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制弹窗显隐
+const createTime = ref()
 // 查询参数
 const searchQuery = reactive({
   templateNo: '', // 编号
@@ -18,31 +19,43 @@
   createEndTime: '',
   limit: 5,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   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' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
-  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'templateDesc', align: 'center' },
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
+  { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '内容描述', value: 'templateDesc', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 const checkoutList = ref<string[]>([]) // 多选选中参数
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('templateType')
-  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
 }
+// ----------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -74,7 +87,8 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  // searchQuery.templateType = '' // 类型不能变
+  searchQuery.certificationType = '0'
+  createTime.value = ''
   searchQuery.ids = []
   getList()
 }
@@ -82,10 +96,10 @@
 // 点击保存
 const submitForm = () => {
   if (!checkoutList.value.length) {
-    ElMessage.warning('请选择证书报告模板')
+    ElMessage.warning('请选择证书模板')
   }
   else {
-    emits('add', checkoutList.value[0])
+    emits('confirm', checkoutList.value[0])
     dialogFormVisible.value = false
   }
 }
@@ -103,15 +117,25 @@
 // 初始化
 const initDialog = () => {
   dialogFormVisible.value = true
-  getType().then((_) => {
+  getDict().then((_) => {
     getList()
   })
 }
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+  <el-dialog v-model="dialogFormVisible" title="选择证书模板" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
@@ -121,7 +145,18 @@
         <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" />
+        <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
new file mode 100644
index 0000000..f8be703
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectMeasueDataDialog.vue
@@ -0,0 +1,199 @@
+<!-- 选择计量数据 -->
+<script lang="ts" setup name="EnvironmentalDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+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'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  approvalStatus: '4', // 审批状态 4已通过
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
+  offset: 1, // 当前页
+  limit: 5, // 每页多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', width: '220' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getReportList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '4', // 审批状态 4已通过
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
+    offset: 1, // 当前页
+    limit: 5, // 每页多少条
+  }
+  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 submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择原证书')
+  }
+  else {
+    emits('confirm', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData(true)
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原证书" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[5]"
+        :is-multi="false" @change="changePage"
+        @multi-select="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>
+    </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/measureData/dialog/selectTechFilesDialog.vue b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
new file mode 100644
index 0000000..f6f1a5a
--- /dev/null
+++ b/src/views/business/lab/measureData/dialog/selectTechFilesDialog.vue
@@ -0,0 +1,247 @@
+<!-- 选择所依据的技术文件--（质量文件、计量规程规范） -->
+<script lang="ts" setup name="SelectTechFilesDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi as SelectTechFiles } from '@/api/measure/file'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getReportList } from '@/api/business/lab/report'
+import { getDictByCode } from '@/api/system/dict'
+import type { fileResType } from '@/views/measure/file/file-interface'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  fileCode: '', // 文件号
+  effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
+  limit: 20,
+  offset: 1,
+  fileType: '', // 类型
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
+})
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const checkoutList = ref([]) // 多选表格
+const total = ref(0)
+const fileClass = ref('0') // 文件分类
+const columns = ref<TableColumn[]>([
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
+  { text: '文件类别', value: 'fileTypeName', align: 'center', width: '120' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '120' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '120' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+
+// ------------------------------------------字典---------------------------------------
+// 获取类型
+const qualityFileTypeList = ref([]) as any // 质量文件-文件类别
+const effectiveStatusSelect = ref<fileResType[]>([])
+
+const getDict = async () => {
+  const res = await getDictByCode('fileType')
+  res.data.forEach((item: { name: string }) => {
+    if (item.name === '质量手册' || item.name === '程序文件'
+      || item.name === '质量记录' || item.name === '操作规程'
+      || item.name === '作业指导书') {
+      qualityFileTypeList.value.push(item)
+    }
+  })
+  qualityFileTypeList.value.unshift({
+    name: '全部',
+    value: '0',
+    id: 'all',
+  })
+  // if (props.name !== '质量文件') {
+  //   listQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  // }
+
+  // 获取实施状态
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+getDict()
+
+// 查询列表
+const fetchData = () => {
+  loadingTable.value = true
+  SelectTechFiles({ ...listQuery.value, fileType: listQuery.value.fileType === '' ? '0' : listQuery.value.fileType }).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: { fileName: string; publishTime: string;effectiveTime: string }) => {
+        return {
+          ...item,
+          publishTime: dayjs(item.publishTime).format('YYYY-MM-DD'),
+          effectiveTime: dayjs(item.effectiveTime).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+fetchData()
+
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+    effectiveStatus: '', // 实施状态
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
+    limit: 20,
+    offset: 1,
+    fileType: '', // 类型
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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()
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择依据的技术文件')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 文件分类变化
+const changeFileClass = (val: string) => {
+  listQuery.value.fileType = val
+  // fetchData()
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择所依据的技术文件" width="60%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="listQuery.fileName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.fileCode" placeholder="文件号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="fileClass" placeholder="文件分类" class="short-input" @change="changeFileClass">
+          <el-option
+            v-for="item in [{ value: '0', name: '质量文件' }, { value: '10', name: '计量规程规范' }]"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item v-if="fileClass === '0'">
+        <el-select v-model="listQuery.fileType" placeholder="文件类别" clearable class="short-input">
+          <el-option
+            v-for="item in qualityFileTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.effectiveStatus" placeholder="实施状态" clearable class="short-input">
+          <el-option
+            v-for="item in effectiveStatusSelect"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="[20]"
+        :is-multi="true"
+        @change="changePage"
+        @multi-select="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>
+    </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/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 8319f65..d25a212 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,13 +1,14 @@
 // 查询条件
 export interface IListQuery {
-  approvalStatus: string // 审批状态
-  certificateReportCode: string // 证书编号
-  certificateReportName: string // 证书名称
-  customerName: string // 委托方名称
-  sampleName: string // 样品名称
-  measureCategory: string // 检校类别
-  approvalStatusName: string // 审批状态名称
-  formId: string
+  approvalStatus: string //	审批状态类型code
+  certificateReportCode: string //		证书编号
+  certificateReportName: string //		证书名称
+  customerName: string //		委托方名称
+  formId: string //		表单id（流程定义对应的表单id，等价于业务id）
+  measureCategory: string //	检校类别
+  orderCode: string //	委托书编号
+  sampleName: string //	样品名称
+  sampleNo: string //	样品编号
   offset: number
   limit: number
 }
@@ -28,47 +29,53 @@
   calibrationTime: string // 检校日期
   taskId?: string // 任务id 用于审批
   decisionItem?: string
-  applyApprovalStatusName?: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
 }
 
 // 表单
 export interface IForm {
-  tdysczs: number // 替代已生成证书
+  id?: string
+  invalid: number // 替代已生成证书
   formId: string
-  yzs: string // 原证书
+  oldCertificateCode: string // 原证书
   calibrationMajor: string // 检校专业
-  certifications: string // 证书类别
+  calibrationMajorName: string // 检校专业名称
+  certificateReportCategory: string // 证书类别
+  certificateReportCategoryName: string // 证书类别名称
   certificateReportCode: string // 证书编号
   certificateReportName: string // 证书名称
-  jdy: string // 检定员
-  jjrq: string // 检校日期
+  measurePerson: string // 检定员
+  measurePersonId: string // 检定员id
+  calibrationTime: string // 检校日期
 
   orderCode: string // 委托书
   orderId: string // 委托书id
   customerId?: string // 委托放id
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
   calibrationPlace: string // 检校地点
 
-  fjsj: string // 复校时间
-  jssj: string // 接收时间
-  jdjg: string // 检定结果
-  environmentCode: string// 环境记录单编号
+  repeatTime: string // 复校时间
+  deliverTime: string // 接收时间
+  measureResult: string // 检定结果
+  environmentCode: string // 环境记录单编号
 
   environmentId: string // 环境记录单id
   temperature: string // 温度
   humidity: string // 湿度
+  techFilesName: string // 依据的技术文件名称
   signId: string // 	电子签章id
   signName: string // 	电子签章名称
   approvalSignIds: string // 认可标志专用章id
   approvalSignName: string // 认可标志专用章名称
   remark: string // 备注
-  ywy: string // 业务员
+  busPersonId: string //	业务员id
+  busPersonName: string // 业务员名字
   templateId: string // 证书模板
   templateName: string // 证书模板
-  templateNameFile: string // 证书模板文件
   certificateReportFile: string // 证书报告附件
 
   processId?: string // 流程实例id
@@ -76,6 +83,7 @@
 
 // 被检样品
 export interface ISampleList {
+  id: string // 样品id
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 4aa9717..c554c33 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
+import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
 import selectSignature from '../components/selectSignature.vue'
 import selectReportTemplate from '../components/selectReportTemplate.vue'
@@ -10,10 +11,12 @@
 import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
 import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import selectMeasueDataDialog from './dialog/selectMeasueDataDialog.vue'
+import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { UploadFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,6 +24,9 @@
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import { downloadFile } from '@/utils/download'
 import type { dictType } from '@/global'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
+
 const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -31,6 +37,8 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
+console.log('opopopop', query)
+
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -38,57 +46,63 @@
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const ruleFormRef = ref<FormInstance>() as any
 const form = ref<IForm>({
-  tdysczs: 0, // 替代已生成证书
+  invalid: 0, // 替代已生成证书
   formId: query.formId as string,
-  yzs: '', // 原证书
+  oldCertificateCode: '', // 原证书
   calibrationMajor: '', // 检校专业
-  certifications: '', // 证书类别
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCategoryName: '', // 证书类别名称
   certificateReportCode: '', // 证书编号
   certificateReportName: '', // 证书名称
-  jdy: '', // 检定员
-  jjrq: '', // 检校日期
+  measurePerson: '', // 检定员
+  measurePersonId: '', // 检定员id
+  calibrationTime: '', // 检校日期
 
-  orderCode: '', // 委托单
+  orderCode: '', // 委托单编号
   orderId: '', // 委托单id
   customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
   calibrationPlace: '', // 检校地点
 
-  fjsj: '', // 复校时间
-  jssj: '', // 接收时间
-  jdjg: '', // 检定结果
+  repeatTime: '', // 复校时间
+  deliverTime: '', // 接收时间
+  measureResult: '', // 检定结果
   environmentCode: '', // 环境记录单编号
   environmentId: '', // 环境记录单id
   temperature: '', // 温度
   humidity: '', // 湿度
+  techFilesName: '', // 依据的技术文件名称
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   remark: '', // 备注
-  ywy: '', // 业务员
+  busPersonId: '', //	业务员id
+  busPersonName: '', // 业务员名字
   templateId: '', // 证书模板
   templateName: '', // 证书模板
-  templateNameFile: '', // 证书模板文件
   certificateReportFile: '', // 证书报告附件
 })
 
 // 校验规则
 const formRules = ref<FormRules>({
-  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  oldCertificateCode: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
   calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
-  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportCategory: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
   certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
   customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  customerAddress: [{ required: true, message: '委托方地址必填', trigger: ['blur', 'change'] }],
   certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
   certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
   calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
-  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
-  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
-  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
-  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
-  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  measurePersonId: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  calibrationTime: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  repeatTime: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  deliverTime: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  measureResult: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
   temperature: [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -111,6 +125,7 @@
 // ---------------------------------------字典--------------------------------------------
 const certificationTypeMap = ref<dictType[]>([]) // 证书类别
 const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const userList = ref<any[]>([]) // 检定员
 // 获取字典值
 async function getDict() {
   // 校检专业
@@ -119,12 +134,22 @@
   // 证书类别
   const rescertificationType = await getDictByCode('certificationType')
   certificationTypeMap.value = rescertificationType.data
+
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 // -------------------------------------原证书--------------------------------------------
+const selectMeasueDataDialogRef = ref() // 选择原证书组件ref
 // 点击选择原证书
 const selectOrigin = () => {
-  //
+  selectMeasueDataDialogRef.value.initDialog()
+}
+// 选好原证书
+const selectMeasueDataConfirm = (val: any) => {
+  getDetail(val.id, val.certificateReportCode)
 }
 // ------------------------------------委托单------------------------------------------
 // 点击选择委托单编号
@@ -142,12 +167,17 @@
     form.value.orderCode = val[0].orderCode // 委托单
     form.value.customerId = val[0].customerId// 委托方id
     form.value.customerName = val[0].customerName// 委托方名称
+    form.value.customerAddress = val[0].customerAddress// 委托方地址
     form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
     form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+    form.value.busPersonId = val[0].busPersonId// 业务员id
+    form.value.busPersonName = val[0].busPersonName// 业务员名字
   }
 }
 
 // -------------------------------选择环境记录单----------------------------------------
+const businessEnvironmentRecord = ref({}) as any // 环境记录单信息
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -156,6 +186,7 @@
 }
 // 选择环境记录单表格确认
 const environmentalAdd = (data: any) => {
+  businessEnvironmentRecord.value = data
   form.value.environmentId = data.id // 环境记录单id
   form.value.environmentCode = data.environmentCode // 环境记录单编号
   form.value.temperature = data.temperature // 温度
@@ -200,35 +231,16 @@
 }
 
 // -----------------------------------------所依据的技术文件----------------------------------
+const selectTechFilesRef = ref()
+const fileList = ref([]) // 依据的技术文件
 // 点击所依据的技术文件
 const selectTechFiles = () => {
-  //
+  selectTechFilesRef.value.initDialog()
 }
-// --------------------------------------证书模板------------------------------------------
-// 选择证书模板Ref
-const templateDialog = ref()
-// 选择证书模板
-const handleClickTemplate = () => {
-  templateDialog.value.initDialog()
-}
-// 选择证书模板确认
-const confirmCheckoutTemplate = (val: any) => {
-  form.value.templateId = val.id // 证书报告模板id
-  form.value.templateName = val.templateName || '' // 证书报告模板名称
-  form.value.templateNameFile = val.minioFileName // 证书模板附件
-}
-
-// 点击下载证书模板按钮
-const downloadCertTemplate = () => {
-  if (!form.value.templateId) {
-    ElMessage.warning('请先选择证书模板')
-    return false
-  }
-  if (!form.value.templateNameFile) {
-    ElMessage.warning('选择的证书模板无附件，请检查')
-    return false
-  }
-  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+// 选好依据的技术文件
+const selectTechFilesConfirm = (val: any) => {
+  fileList.value = val
+  form.value.techFilesName = val.map((item: { fileName: string }) => item.fileName).join(',')
 }
 
 // ---------------------------------文件上传（上传证书）-------------------------------------------
@@ -283,10 +295,10 @@
 
 // 点击批量添加/选择
 const addSample = () => {
-  if (form.value.orderId) {
-    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  if (form.value.orderId) { // 选择委托单下的样品
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId, false)
   }
-  else {
+  else { // 选择样品库中的样品
     selectSamplesDialogRef.value.initDialog()
   }
 }
@@ -318,7 +330,7 @@
 }
 // ----------------------------------------------所用的计量标准器具--------------------------------------------
 const equipmentVisible = ref(false) // 选择设备对话框显隐
-const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const equipmentInfoList = ref<IEquipmentList[]>([])// 表格数据
 const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
 // 表头
 const equipmentColumns = ref<TableColumn[]>([
@@ -328,8 +340,8 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '不确定度', value: 'uncertainty', align: 'center' },
-  { text: '溯源机构', value: 'syjg', align: 'center' },
-  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '溯源机构', value: 'mesureDeptName', align: 'center' },
+  // { text: '证书编号', value: 'zsbh', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 
@@ -351,9 +363,9 @@
 const confirmSelectEquipment = (val: any) => {
   val.forEach((item: IEquipmentList) => {
     // 只添加列表里不存在的
-    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    const index = equipmentInfoList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
-      equipmentList.value.push(item)
+      equipmentInfoList.value.push(item)
     }
   })
 }
@@ -365,28 +377,109 @@
     return false
   }
   checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
-    equipmentList.value.forEach((element, index) => {
+    equipmentInfoList.value.forEach((element, index) => {
       if (element.equipmentNo === item.equipmentNo) {
-        equipmentList.value.splice(index, 1)
+        equipmentInfoList.value.splice(index, 1)
       }
     })
   })
 }
+
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialogRef = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialogRef.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
+  }
+
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = solveParams()
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      downLoadTemplate(params).then((res) => {
+        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    }
+  })
+}
+
 // -------------------------------------------------------------------------------------------
+// 处理保存、下载模板参数
+function solveParams() {
+  const params = {
+    ...form.value,
+    businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单
+    fileList: fileList.value, // 依据的技术文件
+    equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备
+    sampleId: sampleList.value[0].id, //	样品id(打印证书接口要必传)
+    sampleNo: sampleList.value[0].sampleNo, //	样品编号
+    sampleName: sampleList.value[0].sampleName, //	样品名称
+    sampleModel: sampleList.value[0].sampleModel, //	样品型号
+    manufacturingNo: sampleList.value[0].manufacturingNo, //	出厂编号
+    manufacturer: sampleList.value[0].manufacturer, //	生产厂家
+    sampleRemark: sampleList.value[0].remark, //	样品备注
+    id: pageType.value === 'add' ? '' : form.value.id,
+  }
+  return params
+}
 
 // 获取详情信息
-const getDetail = () => {
+function getDetail(id?: string, certificateReportCode?: string) {
   const loading = ElLoading.service({
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  detail({ id: $route.params.id as string }).then((res) => {
+  getMeasureDataDetail({ id: infoId.value! || id! }).then((res) => {
     loading.close()
     form.value = res.data
-    form.value.createUserName = res.data.applicantName || user.name
-    list.value = res.data.sampleList.filter((item: ISampleList) => {
-      return item !== null
-    })
+    sampleList.value = [{
+      sampleNo: res.data.sampleNo, // 样品编号
+      sampleName: res.data.sampleNo, // 样品名称
+      sampleModel: res.data.sampleNo, // 型号
+      manufacturingNo: res.data.sampleNo, // 出厂编号
+      manufacturer: res.data.sampleNo, // 生产厂家
+      remark: res.data.sampleRemark, // 备注
+      id: res.data.sampleId,
+    }]
+    equipmentInfoList.value = res.data.equipmentInfoList.map((item: { validDate: string }) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    }) // 所用的计量标准器具
+    businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据
+    form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号
+    if (id && certificateReportCode) {
+      form.value.oldCertificateCode = certificateReportCode
+      form.value.invalid = 1
+    }
   }).catch(() => {
     loading.close()
   })
@@ -399,10 +492,13 @@
 
 // 保存
 const handleSave = () => {
-  const tempList = list.value.filter(item => item.sampleNo)
-  if (!tempList.length) {
-    ElMessage.warning('样品信息不能为空')
-    return
+  if (!sampleList.value.length) {
+    ElMessage.warning('被检样品不能为空')
+    return false
+  }
+  if (!equipmentInfoList.value.length) {
+    ElMessage.warning('所用的计量标准器具不能为空')
+    return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
@@ -410,32 +506,22 @@
         lock: true,
         background: 'rgba(255, 255, 255, 0.8)',
       })
-      // 样品&委托单列表（保存/编辑草稿接口入参使用）
-      const temList = [] as any // 临时数组
-      console.log('保存中的数组', list.value)
-
-      list.value.forEach((item: any) => {
-        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
-          temList.push({
-            orderId: item.orderId,
-            sampleId: item.id || item.sampleId,
-          })
-        }
-      })
-      form.value.orderSampleList = temList
+      const params = solveParams()
       if (pageType.value === 'add') { // 新建
-        addApply(form.value).then((res) => {
-          submitId.value = res.data.id
-          form.value.projectNo = res.data.projectNo // 分包项目编号
+        addMeasureData(params).then((res) => {
+          submitId.value = res.data.data.id
+          form.value.certificateReportCode = res.data.data.certificateReportCode
+          form.value.certificateReportName = res.data.data.certificateReportName
           ElMessage.success('保存成功')
           loading.close()
         }).catch(() => {
           loading.close()
         })
       }
+
       else if (pageType.value === 'edit') { // 编辑
         if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
-          failUpdateApply(form.value).then((res) => {
+          failUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -444,7 +530,7 @@
           })
         }
         else { // 草稿箱和已取消
-          updateApply(form.value).then((res) => {
+          draftUpdateMeasureData(params).then((res) => {
             ElMessage.success('保存成功')
             loading.close()
             close()
@@ -466,7 +552,7 @@
     })
     const params = {
       id: submitId.value,
-      formId: query.formId, // 表单id
+      formId: query.formId as string, // 表单id
     }
     submit(params).then(() => {
       ElMessage.success('提交成功')
@@ -481,39 +567,6 @@
   }
 }
 
-const sampleVisible = ref(false)
-const projectVisible = ref(false)
-const isMulti = ref(false)
-const selectIndex = ref(0)
-// 点击选择
-const handleSelect = (index: number, row: ISampleList) => {
-  sampleVisible.value = true // 选择设备对话框显隐
-  isMulti.value = false // 是否单选, false单选、true表格多选
-  selectIndex.value = index
-}
-
-const checkoutList = ref([]) // 选中的行
-
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
-}
-// 修改项目选择对话框显隐
-const changeProjectVisible = (val: boolean) => {
-  projectVisible.value = val
-}
-
-// 删除行
-const delRow = () => {
-  checkoutList.value.forEach((item: ISampleList) => {
-    list.value.forEach((element, index) => {
-      if (element.sampleNo === item.sampleNo) {
-        list.value.splice(index, 1)
-      }
-    })
-  })
-}
-
 // ------------------------------------------审批-----------------------------------------
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -573,11 +626,26 @@
 // ------------------------------------事件-------------------------------------------------
 // 检校专业变化
 const changeCalibrationMajor = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+  const index = calibrationMajorMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.calibrationMajorName = calibrationMajorMap.value[index].name
+  }
+  console.log(form.value.calibrationMajorName)
 }
 // 证书类别变化
 const changeCertifications = (val: string) => {
-  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+  const index = certificationTypeMap.value.findIndex((item: { value: string }) => item.value === val)
+  if (index !== -1) {
+    form.value.certificateReportCategoryName = certificationTypeMap.value[index].name
+  }
+  console.log(form.value.certificateReportCategoryName)
+}
+// 选择检定员变化
+const changeMeasurePersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    form.value.measurePerson = userList.value[index].name
+  }
 }
 // -------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -593,8 +661,9 @@
     // form.value.createUser = user.id // 创建人id
     // form.value.createUserName = user.name // 创建人
     // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-    form.value.jdy = user.name // 创建人
-    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+    form.value.measurePerson = user.name // 检定员名字
+    form.value.measurePersonId = user.id // 检定员id
+    form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
   }
 })
 </script>
@@ -606,7 +675,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+        <el-button type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
@@ -641,25 +710,25 @@
         label-width="140"
         :rules="formRules"
       >
-        <el-row :gutter="24">
+        <el-row v-if="pageType === 'add'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="">
-              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+              <el-checkbox v-model="form.invalid" :true-label="1" :false-label="0">
                 替代已生成证书
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.tdysczs" :span="6">
-            <el-form-item label="原证书:" prop="yzs">
+          <el-col v-if="form.invalid" :span="12">
+            <el-form-item label="原证书:" prop="oldCertificateCode">
               <el-input
-                v-model="form.yzs"
+                v-model="form.oldCertificateCode"
                 disabled
-                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+                placeholder="请选择原证书"
               >
-                <template v-if="pageType !== 'detail'" #append>
+                <template #append>
                   <el-button
                     size="small"
-                    @click="selectOrigin(true)"
+                    @click="selectOrigin"
                   >
                     选择
                   </el-button>
@@ -684,15 +753,15 @@
                   v-for="item in calibrationMajorMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书类别:" prop="certifications">
+            <el-form-item label="证书类别:" prop="certificateReportCategory">
               <el-select
-                v-model="form.certifications"
+                v-model="form.certificateReportCategory"
                 clearable
                 size="default"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
@@ -704,7 +773,7 @@
                   v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -720,7 +789,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书名称:" prop="certificateReportName">
               <el-input
                 v-model.trim="form.certificateReportName"
@@ -730,6 +799,17 @@
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="证书名称:">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                :disabled="pageType !== 'edit'"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="委托单:">
@@ -761,6 +841,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model.trim="form.customerAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="证书单位名称:" prop="certificationCompany">
               <el-input
@@ -796,20 +888,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检定员:" prop="jdy">
-              <el-input
-                v-model.trim="form.jdy"
+            <el-form-item label="检定员:" prop="measurePersonId">
+              <el-select
+                v-model="form.measurePersonId"
+                placeholder="请选择检定员"
                 class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
-                clearable
                 :disabled="pageType === 'detail'"
-              />
+                filterable
+                @change="changeMeasurePersonId"
+              >
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校日期:" prop="jjrq">
+            <el-form-item label="检校日期:" prop="calibrationTime">
               <el-date-picker
-                v-model="form.jjrq"
+                v-model="form.calibrationTime"
                 type="date"
                 placeholder="请选择检校日期"
                 format="YYYY-MM-DD"
@@ -818,10 +913,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '3'" :span="6">
-            <el-form-item label="复校时间(月):" prop="fjsj">
+          <el-col v-if="form.certificateReportCategory === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="repeatTime">
               <el-input-number
-                v-model="form.fjsj"
+                v-model="form.repeatTime"
                 :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
                 :class="{ 'detail-input': pageType === 'detail' }"
                 :disabled="pageType === 'detail'"
@@ -829,10 +924,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '1'" :span="6">
-            <el-form-item label="接收时间:" prop="jssj">
+          <el-col v-if="form.certificateReportCategory === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="deliverTime">
               <el-date-picker
-                v-model="form.jssj"
+                v-model="form.deliverTime"
                 type="datetime"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -841,10 +936,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.certifications === '2'" :span="6">
-            <el-form-item label="检定结果:" prop="jdjg">
+          <el-col v-if="form.certificateReportCategory === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="measureResult">
               <el-input
-                v-model.trim="form.jdjg"
+                v-model.trim="form.measureResult"
                 class="full-width-input"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
                 :disabled="pageType === 'detail'"
@@ -892,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+            <el-form-item label="所依据的技术文件:" prop="techFilesName">
               <el-input
-                v-model.trim="form.approvalSignName"
+                v-model.trim="form.techFilesName"
                 :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
                 class="full-width-input"
                 disabled
@@ -958,8 +1053,7 @@
           <el-col :span="6">
             <el-form-item label="业务员:">
               <el-input
-                v-model.trim="form.ywy"
-                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                v-model.trim="form.busPersonName"
                 class="full-width-input"
                 clearable
                 disabled
@@ -1038,7 +1132,7 @@
         </el-button>
       </template>
       <el-table
-        :data="equipmentList"
+        :data="equipmentInfoList"
         border
         style="width: 100%;"
         max-height="600"
@@ -1075,12 +1169,16 @@
     <!-- 选择认可标志专用签章 -->
     <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
     <!-- 选择证书模板 -->
-    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <select-report-template ref="templateDialogRef" @confirm="confirmCheckoutTemplate" />
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
     <!-- 选择样品库下的样品 -->
     <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
     <!-- 选择测量设备 -->
     <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+    <!-- 选择原证书  -->
+    <select-measue-data-dialog ref="selectMeasueDataDialogRef" @confirm="selectMeasueDataConfirm" />
+    <!-- 选择依据的技术文件  -->
+    <select-tech-files-dialog ref="selectTechFilesRef" @confirm="selectTechFilesConfirm" />
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 5c011b8..96ffa13 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -2,16 +2,19 @@
 <script lang="ts" setup name="MeasureDataList">
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IList, IListQuery } from './measureData-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
-import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
-import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { cancelApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { deleteMeasureData, getMeasureDataList, submit } from '@/api/business/lab/measureData'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter() // 初始化路由
 const approvalDialog = ref() // 审批对话ref
@@ -22,13 +25,14 @@
 // 查询条件
 const listQuery = ref<IListQuery>({
   approvalStatus: active.value, // 审批状态
-  certificateReportCode: '', // 证书编号
-  certificateReportName: '', // 证书名称
-  customerName: '', // 委托方名称
-  sampleName: '', // 样品名称
-  measureCategory: '', // 检校类别
-  formId: '',
-  approvalStatusName: '', // 审批状态名称
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
@@ -38,13 +42,15 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('measureDataList') || {
-  measureCategory: '',	// 校验类别
-  createUser: '',	// 创建人
-  manufacturingNo: '',	// 出厂编号
-  originalRecordCode: '',	// 原始记录单编号
-  sampleModel: '',	// 样品型号
-  sampleName: '',	// 样品名称
-  sampleNo: '',	// 样品编号
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', //		证书编号
+  certificateReportName: '', //		证书名称
+  customerName: '', //		委托方名称
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+  measureCategory: '', //	检校类别
+  orderCode: '', //	委托书编号
+  sampleName: '', //	样品名称
+  sampleNo: '', //	样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 }
@@ -57,31 +63,39 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
-  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePersonName', align: 'center' },
-  { text: '证书附件', value: 'measurePersonName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
 
 // 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  // loadingTable.value = true
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getPrimitiveLogList(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
+  getMeasureDataList(listQuery.value).then((response: any) => {
+    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+      return {
+        ...item,
+        calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
+        followLinkArr: [item.orderCode], // 委托单编号
+        fileArr: [item.certificateReportFile], // 证书附件
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 
 // 搜索
@@ -93,13 +107,14 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: active.value, // 审批状态
-    certificateReportCode: '', // 证书编号
-    certificateReportName: '', // 证书名称
-    customerName: '', // 委托方名称
-    sampleName: '', // 样品名称
-    measureCategory: '', // 检校类别
-    formId: '',
-    approvalStatusName: '', // 审批状态名称
+    certificateReportCode: '', //		证书编号
+    certificateReportName: '', //		证书名称
+    customerName: '', //		委托方名称
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    measureCategory: '', //	检校类别
+    orderCode: '', //	委托书编号
+    sampleName: '', //	样品名称
+    sampleNo: '', //	样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
@@ -165,13 +180,13 @@
       },
     )
       .then(() => {
-        // cancelApproval(params).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '取消成功',
-        //   })
-        //   fetchData(true)
-        // })
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '删除') {
@@ -185,13 +200,13 @@
       },
     )
       .then(() => {
-        // deleteListItem({ id: row.id }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '删除成功',
-        //   })
-        //   fetchData(true)
-        // })
+        deleteMeasureData({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '提交') {
@@ -205,13 +220,13 @@
       },
     )
       .then(() => {
-        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
-        //   ElMessage({
-        //     type: 'success',
-        //     message: '已提交',
-        //   })
-        //   fetchData(true)
-        // })
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
       })
   }
   else if (val === '同意') {
@@ -228,7 +243,7 @@
       path: `/lab/measureData/${val}/${row.id}`,
       query: {
         formId: listQuery.value.formId,
-        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        approvalStatusName: row.approvalStatusName, // 审批状态名称
         decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
         processId: row.processId, // 流程实例
         taskId: row.taskId, // 任务id，用于审批
@@ -264,15 +279,24 @@
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
-  console.log(val)
-
   active.value = val
   window.sessionStorage.setItem(TabActiveButton, val)
-  // clearList()
   listQuery.value.approvalStatus = active.value
   fetchData(true)
 }
 
+// 点击委托单编号
+const handleClickFollowLink = (row: any) => {
+  if (row.orderId) {
+    $router.push({
+      path: `/schedule/order/detail/${row.orderId}`,
+    })
+  }
+  else {
+    ElMessage.warning('此条数据没有委托单信息')
+  }
+}
+
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -285,7 +309,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="business-lab-measure-data">
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
@@ -319,7 +343,6 @@
         <el-select
           v-model="listQuery.measureCategory"
           placeholder="检校类别"
-          style="width: 195px;"
           clearable
         >
           <el-option
@@ -330,13 +353,6 @@
           />
         </el-select>
       </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.approvalStatusName"
-          placeholder="审批状态"
-          clearable
-        />
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -369,6 +385,7 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @handleClickFollowLink="handleClickFollowLink"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
@@ -483,3 +500,12 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss">
+.business-lab-measure-data {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 13ee3ab..877ea57 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -356,7 +356,7 @@
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
     sampleList.value = res.data.customerSampleList // 样品列表
-    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
+    dataForm.value.orderId = res.data.orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
     loading.close()
   })
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 13a1a0c..454788f 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -4,6 +4,8 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
+  orderTimeStart: string //	委托日期开始
+  orderTimeEnd: string //	委托日期结束
   offset: number
   limit: number
 }
@@ -14,17 +16,17 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  deliverer: string // 送样人
-  delivererTel: string // 联系方式
+  orderTime: string // 委托日期
   sampleCount: string // 样品数量
-  isUrgent: string // 是否加急
-  createTime: string // 创建时间
-  postedPrice: number // 标价（单位分）
-  suggestedDiscount: string // 建议折扣-单位%
-  suggestedPrice: number // 建议价格-单位分
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用-单位分
+  sampleWarehouseName: string // 样品库房
+  certWarehouseName: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: string // 检测费(实)(元)
+  shouldTestFee: string // 检测费(应)(元)
+  actualTotalFee: string // 实收合计(元)
+  receivedAmount: string // 到账金额(元)
+  invoiceAmount: string // 开票金额(元)
 }
 
 // 字典
@@ -49,21 +51,22 @@
 // 表单
 export interface IForm {
   orderCode: string // 委托书编号
-  orderId: string // 委托书编号
-  deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
-  createTime: string // 委托单创建时间
-  planDeliverTime: string // 预计送达时间
-  requireOverTime: string // 要求检完时间
-  customerNo: string // 委托方代码
-  customerId: string // 委托方id
+  orderId: string // 委托单id
   customerName: string // 委托方名称
-  phone: string // 委托方电话
-  priceFront: number // 标价
-  suggestedDiscount: number // 建议折扣
-  suggestedPrice: number // 建议价格
-  extraCharge: number // 附加费用-单位分
-  extraChargeIllustration: string // 附加费用说明
-  totalSettlement: number // 总计结算费用
-  samplePriceList: Array<IsampleList[]> // 样品清单
+  orderTime: string // 委托日期
+  sampleCount: string // 样品数量
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  deliverer: string // 联系人
+  delivererTel: string // 联系方式
+  sampleWarehouse: string // 样品库房
+  certWarehouse: string // 证书库房
+  feeStatus: string // 费用状态
+  received: string // 是否到账
+  actualTestFee: Number // 检测费(实)(元)
+  shouldTestFee: Number // 检测费(应)(元)
+  actualTotalFee: Number // 实收合计(元)
+  receivedAmount: Number // 到账金额(元)
+  invoiceAmount: Number // 开票金额(元)
+  remark: string // 备注
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index e11f337..7630aeb 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -7,13 +7,18 @@
 import { useRoute, useRouter } from 'vue-router'
 import { el } from 'element-plus/es/locale'
 import type { IForm, IsampleList } from './businessSettlement-interface'
+import multiTable from '@/components/MultiHeaderTable/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { UploadFile } from '@/api/measure/file'
+import { calc } from '@/utils/useCalc'
+import type { dictType } from '@/global'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import { getOrderDetail } from '@/api/business/schedule/order'
 import { isNumber, validateMoney } from '@/utils/validate'
-import { calc } from '@/utils/useCalc'
+import useCheckList from '@/utils/useCheckList'
 import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement'
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -27,54 +32,215 @@
 // 表单数据
 const form = ref<IForm>({
   orderCode: '', // 委托书编号
-  orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  createTime: '', // 委托单创建时间
-  planDeliverTime: '', // 预计送达时间
-  requireOverTime: '', // 要求检完时间
-  customerNo: '', // 委托方代码
-  customerId: '', // 委托方id
+  orderId: '', // 委托单id
   customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  priceFront: 0, // 标价
-  suggestedDiscount: 95, // 建议折扣
-  suggestedPrice: 0, // 建议价格
-  extraCharge: 0, // 附加费用-单位分
-  extraChargeIllustration: '', // 附加费用说明
-  totalSettlement: 0, // 总计结算费用
-  samplePriceList: [], // 样品清单
+  orderTime: '', // 委托日期
+  sampleCount: '', // 样品数量
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  deliverer: '', // 联系人
+  delivererTel: '', // 联系方式
+  sampleWarehouse: '未入库', // 样品库房
+  certWarehouse: '未入库', // 证书库房
+  feeStatus: '未录费', // 费用状态
+  received: '未到账', // 是否到账
+  actualTestFee: 0, // 检测费(实)(元)
+  shouldTestFee: 0, // 检测费(应)(元)
+  actualTotalFee: 0, // 实收合计(元)
+  receivedAmount: 0, // 到账金额(元)
+  invoiceAmount: 0, // 开票金额(元)
+  remark: '', // 备注
 })
-const ruleFormRef = ref<FormInstance>() as any
-const list = ref<IsampleList[]>([])// 表格数据
-const orderVisible = ref(false) // 控制委托书对话框显隐
-
-// 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: false },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: false },
-  { text: '型号', value: 'sampleModel', align: 'center', required: false },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: false },
-  { text: '检定项目', value: 'measureContent', align: 'center', required: false },
-  { text: '标价(元)', value: 'price', align: 'center', required: true, reg: validateMoney },
-])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
-  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
-    { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
+  orderCode: [{ required: true, message: '委托单编号必填', trigger: 'blur' }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: 'blur' }],
+  orderTime: [{ required: true, message: '委托日期必填', trigger: 'blur' }],
+  sampleCount: [{ required: true, message: '样品数量必填', trigger: 'blur' }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '联系电话必填', trigger: 'blur' }],
+  sampleWarehouse: [{ required: true, message: '样品库房必填', trigger: 'blur' }],
+  certWarehouse: [{ required: true, message: '证书库房必填', trigger: 'blur' }],
+  feeStatus: [{ required: true, message: '费用状态必填', trigger: 'blur' }],
+  received: [{ required: true, message: '是否到账必填', trigger: 'blur' }],
+  actualTestFee: [{ required: true, message: '检测费(实)(元)必填', trigger: 'blur' }],
+  shouldTestFee: [{ required: true, message: '检测费(应)(元)必填', trigger: 'blur' }],
+  actualTotalFee: [{ required: true, message: '实收合计(元)必填', trigger: 'blur' }],
+  receivedAmount: [{ required: true, message: '到账金额(元)必填', trigger: 'blur' }],
+  invoiceAmount: [{ required: true, message: '开票金额(元)必填', trigger: 'blur' }],
 })
+const ruleFormRef = ref<FormInstance>() as any
+const orderVisible = ref(false) // 控制委托书对话框显隐
 
 // ---------------------------------------路由参数--------------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   infoId.value = $route.params.id as string
 }
+// ---------------------------------------字典--------------------------------------
+
+const financeSampleWarehouseList = ref<dictType[]>([]) // 样品库房
+const financeCertWarehouseList = ref<dictType[]>([]) // 证书库房
+const financeReceivedList = ref<dictType[]>([]) // 是否到账
+// 获取字典值
+function getDict() {
+  // 样品库房
+  getDictByCode('financeSampleWarehouse').then((response) => {
+    financeSampleWarehouseList.value = response.data
+  })
+  // 证书库房
+  getDictByCode('financeCertWarehouse').then((response) => {
+    financeCertWarehouseList.value = response.data
+  })
+  // 是否到账
+  getDictByCode('financeReceived').then((response) => {
+    financeReceivedList.value = response.data
+  })
+}
+getDict()
+// -----------------------------------到账金额明细--------------------------------------------------
+const receivedAmountList = ref([]) as any // 到账金额明细
+const checkoutReceivedAmountList = ref([]) as any // 到账金额明细多选
+// 表头
+const receivedAmountcolumns = ref([
+  { text: '到账金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '到账时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// -------------------------------------开票金额明细--------------------------------------------------------------
+const invoiceAmountList = ref([]) as any // 开票金额明细
+const checkoutInvoiceAmountList = ref([]) as any // 开票金额明细多选
+// 表头
+const invoiceAmountcolumns = ref([
+  { text: '开票金额（元）', value: 'money', align: 'center', width: '220', required: true },
+  { text: '开票时间', value: 'moneyTime', align: 'center', width: '220', required: true },
+  { text: '附件', value: 'attachment', align: 'center', required: false },
+])
+
+// 多选发生改变时
+const handleSelectionChange = (e: any, type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') { // 到账金额明细
+    checkoutReceivedAmountList.value = e
+  }
+  else { // 开票金额明细
+    checkoutInvoiceAmountList.value = e
+  }
+}
+
+// 点击增加行
+const addRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if (type === 'addReceived') {
+    if (useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+      receivedAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '1',
+      })
+    }
+  }
+  else {
+    if (useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+      invoiceAmountList.value.push({
+        money: undefined,
+        moneyTime: '',
+        attachment: [],
+        moneyType: '2',
+      })
+    }
+  }
+}
+
+// 删除行
+const delRow = (type: 'addReceived' | 'invoiceAmount') => {
+  if ((type === 'addReceived' && checkoutReceivedAmountList.value.length <= 0) || (type === 'invoiceAmount' && checkoutInvoiceAmountList.value.length <= 0)) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    if (type === 'addReceived') {
+      receivedAmountList.value = receivedAmountList.value.filter(
+        (item: any) => {
+          return !checkoutReceivedAmountList.value.includes(item)
+        },
+      )
+    }
+    else {
+      invoiceAmountList.value = invoiceAmountList.value.filter(
+        (item: any) => {
+          return !checkoutInvoiceAmountList.value.includes(item)
+        },
+      )
+    }
+  }
+}
+
+// ----------------------------------------上传附件----------------------------------------------------
+// 删除附件
+const del = (index: number, row: any) => {
+  row.value.attachment.splice(index, 1)
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any, row?: any, type?: 'receivedAmount' | 'invoiceAmount') => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          row.attachment.push({
+            minioFileName: item,
+          })
+        })
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// ------------------------------------结算明细--------------------------------------------------------------------
+const list = ref([]) // 开票金额明细
+// 表头
+const columns = ref([
+  { text: '器具名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '型号规格', value: 'sampleModel', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '套数/退', value: 'sets', align: 'center', required: true, width: '180', type: 'inputNumber' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '委托日期', value: 'orderTime', align: 'center', required: true, width: '160', type: 'date' },
+  { text: '检测规范', value: 'accordStandard', align: 'center', width: '180', required: false, type: 'input' },
+  {
+    text: '收费（元）含6%增值税',
+    value: 'price',
+    align: 'center',
+    required: false,
+    children: [
+      { text: '检测费（应）', value: 'shouldTestFee', align: 'center', width: '180', required: true, type: 'inputNumber' },
+      { text: '检测费（实）', value: 'actualTestFee', align: 'center', required: true, width: '180', type: 'inputNumber' },
+      { text: '附加费', value: 'extraFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '修理费', value: 'repairFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '其他费', value: 'otherFee', align: 'center', required: false, width: '180', type: 'inputNumber' },
+      { text: '小计', value: 'subtotal', align: 'center', required: false, type: 'text' },
+    ],
+  },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -87,87 +253,63 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
-    form.value.priceFront = 0 // 标价
-    // form.value.suggestedDiscount = 95 // 建议折扣
-    form.value.suggestedPrice = 0 // 建议价格
-    form.value.extraCharge = 0// 附加费用-单位分
-    form.value.extraChargeIllustration = '' // 附加费用说明
-    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
-      form.value.deliverer = res.data.deliverer // 送检人
-      form.value.delivererTel = res.data.delivererTel // 送检人
-      form.value.createTime = res.data.createTime // 委托单创建时间
-      form.value.customerNo = res.data.customerNo // 委托方代码
-      form.value.customerId = res.data.customerId // 委托方id
       form.value.customerName = res.data.customerName // 委托方名称
-      form.value.planDeliverTime = res.data.planDeliverTime // 预计送达时间
-      form.value.requireOverTime = res.data.requireOverTime // 要求检完时间
-      form.value.phone = res.data.customerPhone // 委托方电话
-      list.value = res.data.customerSampleInfoList.map((item: { isEdit: boolean }) => {
+      form.value.orderTime = res.data.createTime // 委托日期（委托单创建时间）
+      form.value.certificationCompany = res.data.certificationCompany // 证书单位名称
+      form.value.certificationCompanyAddress = res.data.certificationCompanyAddress // 证书单位地址
+      form.value.deliverer = res.data.deliverer // 联系人
+      form.value.delivererTel = res.data.delivererTel // 联系方式
+      form.value.sampleCount = res.data.customerSampleInfoList.length // 样品数量
+      list.value = res.data.customerSampleInfoList.map((item: { createTime: string; editable: boolean }) => {
         return {
           ...item,
-          isEdit: true,
+          orderTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, // 委托日期
+          editable: pageType.value !== 'detail',
+          shouldTestFee: 0, // 检测费（应）
+          actualTestFee: 0, // 检测费（实）
+          extraFee: 0, // 附加费
+          repairFee: 0, // 修理费
+          otherFee: 0, // 其他费
+          sets: 0, // 套数
+          subtotal: 0, // 小计
+          id: '',
         }
       })
     })
   }
 }
-// -----------------------------------------样品清单--------------------------------------------
-// 检查列表
-function checkSampleList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          // ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          ElMessage.warning(`第${index + 1}行: 要求标价为正数，且最多保留两位小数`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
+// --------------------------------------------计算----------------------------------------------
+// 计算
+const handleInputNumberChange = ({ row }: any) => {
+  // 计算小计
+  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+  // 计算检测费(应)(元)
+  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+  // 计算检测费(实)(元)
+  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+  // 实收合计
+  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
 
-// --------------------------------------------自动计算----------------------------------------------
-// 折扣改变-计算建议价格
-const changeSuggestedDiscount = () => {
-  console.log('折扣改变')
-  if (form.value.priceFront) {
-    form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
+  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '未录费'
+  }
+  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+    form.value.feeStatus = '已录费'
+  }
+  else {
+    form.value.feeStatus = '部分录费'
   }
 }
-// 标价改变
-const changePrice = () => {
-  console.log('标价改变')
 
-  let sum = 0
-  list.value.forEach((item) => {
-    if (item.price) {
-      sum = calc(Number(sum), Number(item.price), '+') as number
-    }
-  })
-  form.value.priceFront = sum
-  changeSuggestedDiscount() // 建议价格随之变化
+const changeTableInputNumber = () => {
+  // 到账金额
+  form.value.receivedAmount = receivedAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
+  // 开票金额
+  form.value.invoiceAmount = invoiceAmountList.value.reduce((accumulator: any, current: any) => accumulator + current.money, 0)
 }
-// 附加费用改变
-const changeExtraCharge = () => {
-  console.log('附加费用改变')
-  form.value.totalSettlement = calc(Number(form.value.suggestedPrice), Number(form.value.extraCharge), '+') as number
-}
-watch(() => form.value.suggestedPrice, (newValue) => {
-  changeExtraCharge()
-})
 
 // ----------------------------------------------------------------------------------------
 const $router = useRouter()
@@ -176,9 +318,35 @@
   $router.back()
 }
 
+// 校验表格
+const checkList = () => {
+  if (!receivedAmountList.value.length) {
+    ElMessage.warning('到账金额明细不能为空')
+    return false
+  }
+  if (!invoiceAmountList.value.length) {
+    ElMessage.warning('开票金额明细不能为空')
+    return false
+  }
+  if (!list.value.length) {
+    ElMessage.warning('结算明细不能为空')
+    return false
+  }
+  if (!useCheckList(receivedAmountList.value, receivedAmountcolumns.value, '到账金额明细')) {
+    return false
+  }
+  if (!useCheckList(invoiceAmountList.value, invoiceAmountcolumns.value, '开票金额明细')) {
+    return false
+  }
+  if (!useCheckList(list.value, columns.value, '结算明细')) {
+    return false
+  }
+  return true
+}
+
 // 保存
 const save = () => {
-  if (!checkSampleList()) {
+  if (!checkList()) {
     return false
   }
   ruleFormRef.value.validate((valid: boolean) => {
@@ -188,17 +356,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = {
-        extraCharge: calc(Number(form.value.extraCharge), 100, '*'), // 附加费用-单位分
-        extraChargeIllustration: form.value.extraChargeIllustration, // 附加费用说明
         id: infoId.value,
-        orderId: form.value.orderId, // 委托书id
-        suggestedDiscount: form.value.suggestedDiscount, // 建议折扣-单位%
-        samplePriceList: list.value.map((item) => {
-          return {
-            price: calc(Number(item.price), 100, '*'), // 标价-单位分
-            relationId: item.relationId, // 样品id
-          }
-        }), // 样品清单
+        ...form.value,
+        amountDetailsList: receivedAmountList.value.concat(invoiceAmountList.value),
+        sampleList: list.value,
       }
       // 新建
       if (pageType.value === 'add') {
@@ -229,24 +390,22 @@
 
 // 编辑、详情--获取详细信息
 const fetchDetail = () => {
+  const loading = ElLoading.service({})
   getBusinessSettlementDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
-    form.value.phone = res.data.customerPhone
-    list.value = res.data.sampleList.map((item: { postedPrice: number; id: string }) => {
+    receivedAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '1')
+    invoiceAmountList.value = res.data.amountDetailsList.filter((item: { moneyType: string }) => `${item.moneyType}` === '2')
+    list.value = res.data.sampleDetailsList.map((item: { editable: boolean; orderTime: string }) => {
       return {
         ...item,
-        price: calc(Number(item.postedPrice), 100, '/') as number,
-        isEdit: pageType.value === 'edit',
-        relationId: item.id,
+        editable: pageType.value !== 'detail',
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
-    form.value.priceFront = calc(Number(res.data.postedPrice), 100, '/') as number // 标价
-    // form.value.suggestedDiscount =  // 建议折扣
-    form.value.suggestedPrice = calc(Number(res.data.suggestedPrice), 100, '/') as number// 建议价格
-    form.value.extraCharge = calc(Number(res.data.extraCharge), 100, '/') as number// 附加费用-单位分
-    // form.value.extraChargeIllustration =  // 附加费用说明
-    form.value.totalSettlement = calc(Number(res.data.totalSettlement), 100, '/') as number // 总计结算费用
-  })
+    form.value.orderTime = res.data.sampleDetailsList[0].orderTime // 委托日期
+    form.value.sampleCount = res.data.sampleDetailsList.length // 样品数量
+    loading.close()
+  }).catch(() => loading.close())
 }
 
 onMounted(() => {
@@ -278,10 +437,10 @@
         >
           <el-row :gutter="24">
             <el-col :span="6">
-              <el-form-item label="委托书编号:" prop="orderCode">
+              <el-form-item label="委托单编号:" prop="orderCode">
                 <el-input
                   v-model="form.orderCode"
-                  :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托单编号'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 >
@@ -294,51 +453,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="送检人" prop="deliverer">
-                <el-input
-                  v-model="form.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="联系方式" prop="delivererTel">
-                <el-input
-                  v-model="form.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : '送检人联系方式'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托单创建时间:" prop="createTime">
-                <el-date-picker
-                  v-model="form.createTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '委托单创建时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="委托方代码:" prop="customerNo">
-                <el-input
-                  v-model="form.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="委托方名称:" prop="customerName">
                 <el-input
                   v-model="form.customerName"
@@ -348,118 +462,182 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="委托方地址:" prop="customerAddress">
+            <el-col :span="6">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="form.orderTime"
+                  type="date"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量:" prop="sampleCount">
                 <el-input
-                  v-model="form.customerAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  v-model="form.sampleCount"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   disabled
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位名称:" prop="certificationCompany">
+                <el-input
+                  v-model="form.certificationCompany"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                <el-input
+                  v-model="form.certificationCompanyAddress"
+                  :placeholder="pageType === 'detail' ? '' : '样品数量'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="deliverer">
+                <el-input
+                  v-model="form.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '联系人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="delivererTel">
+                <el-input
+                  v-model="form.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '联系电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品库房" prop="sampleWarehouse">
+                <el-select
+                  v-model="form.sampleWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择样品库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeSampleWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="6">
-              <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="form.planDeliverTime"
-                  type="datetime"
+              <el-form-item label="证书库房" prop="certWarehouse">
+                <el-select
+                  v-model="form.certWarehouse"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择证书库房"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeCertWarehouseList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用状态" prop="feeStatus">
+                <el-input
+                  v-model="form.feeStatus"
+                  :placeholder="pageType === 'detail' ? '' : '费用状态'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否到账" prop="received">
+                <el-select
+                  v-model="form.received"
+                  :disabled="pageType === 'detail'"
+                  placeholder="请选择是否到账"
+                  style="width: 100%;"
+                  filterable
+                >
+                  <el-option v-for="item in financeReceivedList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(实)(元)" prop="actualTestFee">
+                <el-input
+                  v-model="form.actualTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(实)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
+                <el-input
+                  v-model="form.shouldTestFee"
+                  :placeholder="pageType === 'detail' ? '' : '检测费(应)(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+                <el-input
+                  v-model="form.actualTotalFee"
+                  :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="到账金额(元)" prop="receivedAmount">
+                <el-input
+                  v-model="form.receivedAmount"
+                  :placeholder="pageType === 'detail' ? '' : '到账金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开票金额(元)" prop="invoiceAmount">
+                <el-input
+                  v-model="form.invoiceAmount"
+                  :placeholder="pageType === 'detail' ? '' : '开票金额(元)'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model.trim="form.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
-                <el-date-picker
-                  v-model="form.requireOverTime"
-                  type="datetime"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                  format="YYYY-MM-DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="pageType === 'detail' ? '' : '委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标价(元)">
-                <el-input
-                  v-model="form.priceFront"
-                  :placeholder="pageType === 'detail' ? '' : '标价'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议折扣(%)" prop="suggestedDiscount">
-                <el-input-number
-                  v-model="form.suggestedDiscount"
-                  :placeholder="pageType === 'detail' ? '' : '请输入建议折扣'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  type="textarea"
+                  autosize
+                  clearable
                   :disabled="pageType === 'detail'"
-                  :max="100"
-                  :min="0"
-                  @change="changeSuggestedDiscount"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="建议价格(元)">
-                <el-input
-                  v-model="form.suggestedPrice"
-                  :placeholder="pageType === 'detail' ? '' : '建议价格'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用(元)" prop="extraCharge">
-                <el-input
-                  v-model="form.extraCharge"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @change="changeExtraCharge"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="附加费用说明" prop="extraChargeIllustration">
-                <el-input
-                  v-model="form.extraChargeIllustration"
-                  :placeholder="pageType === 'detail' ? '' : '附加费用说明'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总计结算费用(元)">
-                <el-input
-                  v-model="form.totalSettlement"
-                  :placeholder="pageType === 'detail' ? '' : '总计结算费用'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
                 />
               </el-form-item>
             </el-col>
@@ -467,17 +645,26 @@
         </el-form>
       </div>
     </detail-page>
-    <!-- 表格 -->
-    <detail-block title="样品清单">
+    <detail-block title="到账金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('addReceived')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('addReceived')">
+          删除行
+        </el-button>
+      </template>
       <el-table
-        :data="list"
+        :data="receivedAmountList"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'addReceived')"
       >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
+          v-for="item in receivedAmountcolumns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
@@ -489,21 +676,112 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <!-- 标价可编辑 -->
-            <el-input
-              v-if="item.value === 'price'"
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              placeholder="请输入标价"
-              :disabled="!scope.row.isEdit"
-              class="input"
-              @change="changePrice"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
             />
-            <!-- 除标价另外的行 -->
-            <span v-else>{{ scope.row[item.value] }}</span>
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="开票金额明细">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow('invoiceAmount')">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow('invoiceAmount')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="invoiceAmountList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="(e) => handleSelectionChange(e, 'invoiceAmount')"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in invoiceAmountcolumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input-number
+              v-if="item.value === 'money' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              class="full-width-input"
+              :min="0"
+              @change="changeTableInputNumber"
+            />
+            <el-date-picker
+              v-if="item.value === 'moneyTime' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              type="date"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? '' : '到账时间'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+
+            <div v-if="item.value === 'attachment' && pageType !== 'detail'">
+              <el-button v-if="pageType !== 'detail'" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ '上传' }}
+              </el-button>
+              <div v-for="(item, index) in scope.row.attachment" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item">
+                  <span v-if="pageType !== 'detail'" class="photo-close" @click="del(index, scope.row)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="(e) => onFileChange(e, scope.row, 'receivedAmount')">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="结算明细" style="margin-bottom: 32px;">
+      <multi-table
+        :table-data="list"
+        :table-header="columns"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
+    </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
   </app-container>
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index eea28d8..2852223 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="BusinessSettlementList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery, dictType } from './businessSettlement-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -19,6 +21,8 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 })
@@ -32,27 +36,29 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
+  orderTimeStart: '', //	委托日期开始
+  orderTimeEnd: '', //	委托日期结束
   offset: 1,
   limit: 20,
 }
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
-  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价(元)', value: 'postedPrice', align: 'center' },
-  { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
-  { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
+  { text: '样品库房', value: 'sampleWarehouse', align: 'center' },
+  { text: '证书库房', value: 'certWarehouse', align: 'center' },
+  { text: '费用状态', value: 'feeStatus', align: 'center' },
+  { text: '是否到账', value: 'received', align: 'center' },
+  { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
+  { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
+  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
+  { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -69,10 +75,7 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
-        totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
-        extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
-        postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
       }
     })
     total.value = parseInt(response.data.total)
@@ -93,9 +96,12 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
+    orderTimeStart: '', //	委托日期开始
+    orderTimeEnd: '', //	委托日期结束
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 
@@ -121,6 +127,8 @@
       customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       deliverer: listQuery.value.deliverer, // 送样人
+      orderTimeStart: listQuery.value.orderTimeStart, //	委托日期开始
+      orderTimeEnd: listQuery.value.orderTimeEnd, //	委托日期结束
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -210,6 +218,18 @@
   })
 }
 
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.orderTimeStart = `${val[0]}`
+    listQuery.value.orderTimeEnd = `${val[1]}`
+  }
+  else {
+    listQuery.value.orderTimeStart = ''
+    listQuery.value.orderTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict() // 获取字典
   fetchData(true) // 获取数据
@@ -224,7 +244,7 @@
         <search-item>
           <el-input
             v-model.trim="listQuery.orderCode"
-            placeholder="委托书编号"
+            placeholder="委托单编号"
             class="short-input"
             clearable
           />
@@ -246,11 +266,9 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.deliverer"
-            placeholder="送样人"
-            class="short-input"
-            clearable
+          <el-date-picker
+            v-model="timeRange" type="daterange" range-separator="到" format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" start-placeholder="委托日期(开始)" end-placeholder="委托日期(结束)" clearable
           />
         </search-item>
       </search-area>
diff --git a/src/views/measure/file/components/templateDetail.vue b/src/views/measure/file/components/templateDetail.vue
index 91615bc..5e0aebc 100644
--- a/src/views/measure/file/components/templateDetail.vue
+++ b/src/views/measure/file/components/templateDetail.vue
@@ -114,6 +114,7 @@
     ruleForm.minioFilePdfName = row.minioFilePdfName // pdf文件
     ruleForm.fileType = row.fileType // 文件类别
     ruleForm.fileTypeName = row.fileTypeName// 文件类别名称
+    console.log('-0-0-xiaqing', ruleForm.fileType, row)
   }
 }
 
@@ -147,14 +148,16 @@
             ruleForm.fileNo = res.data.fileNo
             ruleForm.id = res.data.id
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
         if (title.value === '编辑') {
           updateFile(ruleForm).then((res) => {
             ElMessage.success('保存成功')
-            title.value = '详情'
+            // title.value = '详情'
+            close()
             loading.close()
           })
         }
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 536b828..f15f45e 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -147,7 +147,7 @@
     path: `/file/${props.authority}/detail`,
     query: {
       ...row,
-      fileType: searchQuery.fileType,
+      fileType: searchQuery.fileType || row.fileType,
       title: '详情',
       routerName: props.name,
     },
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
index db18a81..7718e76 100644
--- a/src/views/system/tool/certTempate/addDDialog.vue
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -1,19 +1,21 @@
 <!-- 证书模板管理详情弹窗 -->
 <script lang="ts" setup name="CertTempateDetail">
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { templateAdd, templateUpdate } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // 用户信息
 const emits = defineEmits(['resetData']); const user = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   templateNo: '', // 模板编号
   templateName: '', //  模板名称
-  model: '', // 型号规格
+  certificationType: '', // 模板类型
   templateCreator: '', // 负责人
   templateDesc: '', // 内容描述
   createTime: '', // 创建时间
@@ -21,16 +23,37 @@
   id: '',
 }) // 表单
 const title = ref('')
+const loading = ref(false)
 const rules = ref<FormRules>({
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
-  model: [{ required: true, message: '型号规格必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '模板类型必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '附件必填', trigger: 'blur' }],
   createTime: [{ required: true, message: '创建时间必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
+// ----------------------------------------字典---------------------------------------------
+const templateTypeList = ref<dictType[]>([]) // 模板类型
+const getDict = () => {
+  getDictByCode('certificationType').then((res) => {
+    templateTypeList.value = res.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+const clearForm = () => {
+  ruleForm.templateNo = '' // 模板编号
+  ruleForm.templateName = '' //  模板名称
+  ruleForm.certificationType = '' //  模板类型
+  ruleForm.templateCreator = '' //  负责人
+  ruleForm.templateDesc = '' //  内容描述
+  ruleForm.createTime = ''// 创建时间
+  ruleForm.minioFileName = '' // 附件
+}
+
 // 弹窗初始化
 const initDialog = (row: any) => {
+  clearForm()
   title.value = row.title as string
   ruleFormRef.value?.resetFields()
   dialogVisible.value = true
@@ -42,7 +65,7 @@
   else if (row.title === '编辑' || row.title === '详情') {
     ruleForm.templateNo = row.templateNo// 模板编号
     ruleForm.templateName = row.templateName//  模板名称
-    ruleForm.model = row.model//  型号规格
+    ruleForm.certificationType = row.certificationType//  模板类型
     ruleForm.templateCreator = row.templateCreator//  负责人
     ruleForm.templateDesc = row.templateDesc//  内容描述
     ruleForm.createTime = row.createTime// 创建时间
@@ -60,19 +83,22 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true
       if (title.value === '新增') {
-        templateAdd(ruleForm).then((res) => {
+        templateAdd({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
             close()
+            loading.value = false
           }
         })
       }
       else {
-        templateUpdate(ruleForm).then((res) => {
+        templateUpdate({ ...ruleForm, templateType: ruleForm.certificationType }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('更新成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -91,6 +117,10 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -100,6 +130,7 @@
       else {
         ElMessage.error(res.message)
       }
+      loading.close()
     })
   }
 }
@@ -111,7 +142,7 @@
 
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="65%" append-to-body class="container" @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
+    <el-form ref="ruleFormRef" v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="模板编号" prop="templateNo">
@@ -124,8 +155,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="型号规格" prop="model">
-            <el-input v-model.trim="ruleForm.model" :placeholder="title === '详情' ? ' ' : '型号规格'" :disabled="title === '详情'" />
+          <el-form-item label="模板类型" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              :disabled="title === '详情'"
+              :placeholder="title === '详情' ? ' ' : '请选择模板类型'"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in templateTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
index 8192416..350c8a8 100644
--- a/src/views/system/tool/certTempate/list.vue
+++ b/src/views/system/tool/certTempate/list.vue
@@ -6,6 +6,8 @@
 import { getPhotoUrl, templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 import { download } from '@/utils/download'
 const createTime = ref()
 const searchQuery = reactive({
@@ -16,7 +18,7 @@
   createEndTime: '',
   limit: 20,
   offset: 1,
-  templateType: '',
+  certificationType: '0',
   ids: [] as string[],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
@@ -34,20 +36,35 @@
 const columns = ref<TableColumn[]>([
   { text: '编号', value: 'templateNo', align: 'center', width: '160' },
   { text: '模板名称', value: 'templateName', align: 'center' },
-  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '模板类型', value: 'templateTypeName', align: 'center', width: '100' },
   { text: '负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '内容描述', value: 'templateDesc', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
-
+// ---------------------------------------字典--------------------------------------------
+const templateTypeMap = ref([]) as any // 模板类型
+// 获取字典值
+async function getDict() {
+  // 模板类型
+  const res = await getDictByCode('certificationType')
+  res.data.forEach((item: { value: string; name: string }) => {
+    templateTypeMap.value[`${item.value}`] = item.name
+  })
+}
+// ---------------------------------------------------------------------------------------------
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: { certificationType: string }) => {
+        return {
+          ...item,
+          templateTypeName: `${item.certificationType}` ? templateTypeMap.value[item.certificationType] : item.certificationType, // 模板类型
+        }
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -174,7 +191,9 @@
   }
 }
 onMounted(() => {
-  getList()
+  getDict().then(() => {
+    getList()
+  })
 })
 </script>
 
diff --git a/src/views/system/tool/fileTemplate/addDDialog.vue b/src/views/system/tool/fileTemplate/addDDialog.vue
index 1ff8ac0..6cba8a4 100644
--- a/src/views/system/tool/fileTemplate/addDDialog.vue
+++ b/src/views/system/tool/fileTemplate/addDDialog.vue
@@ -1,7 +1,7 @@
 <!-- 文件模板管理详情弹窗 -->
 <script lang="ts" setup name="FileTempateDetail">
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
@@ -12,6 +12,7 @@
 // 用户信息
 const emits = defineEmits(['resetData'])
 const user = useUserStore()
+const loading = ref(false)
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   templateNo: '', // 模板编号
@@ -42,8 +43,19 @@
 }
 getDict()
 // -------------------------------------------------------------------------------------------
+const clearForm = () => {
+  ruleForm.templateNo = ''// 模板编号
+  ruleForm.templateName = ''//  模板名称
+  ruleForm.templateCreator = ''// 负责人
+  ruleForm.templateDesc = ''// 内容描述
+  ruleForm.createTime = ''// 创建时间
+  ruleForm.minioFileName = ''// 附件
+  ruleForm.templateType = ''// 模板类型
+}
+
 // 弹窗初始化
 const initDialog = (row: any) => {
+  clearForm()
   title.value = row.title as string
   ruleFormRef.value?.resetFields()
   dialogVisible.value = true
@@ -73,11 +85,13 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true
       if (title.value === '新增') {
         templateAdd(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -86,6 +100,7 @@
           if (res.code === 200) {
             ElMessage.success('更新成功')
             close()
+            loading.value = false
           }
         })
       }
@@ -104,6 +119,10 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -113,6 +132,7 @@
       else {
         ElMessage.error(res.message)
       }
+      loading.close()
     })
   }
 }
@@ -124,7 +144,7 @@
 
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="65%" append-to-body class="container" @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
+    <el-form ref="ruleFormRef" v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="模板编号" prop="templateNo">
diff --git a/src/views/system/tool/fileTemplate/list.vue b/src/views/system/tool/fileTemplate/list.vue
index c5ee694..a7a6290 100644
--- a/src/views/system/tool/fileTemplate/list.vue
+++ b/src/views/system/tool/fileTemplate/list.vue
@@ -18,7 +18,7 @@
   createEndTime: '',
   limit: 20,
   offset: 1,
-  templateType: '',
+  templateType: '0',
   ids: [] as string[],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
diff --git a/src/views/workbench/approve/useChangePage.ts b/src/views/workbench/approve/useChangePage.ts
index bc3d46b..43fca74 100644
--- a/src/views/workbench/approve/useChangePage.ts
+++ b/src/views/workbench/approve/useChangePage.ts
@@ -166,7 +166,8 @@
     row.approvalStatusName = approvalStatusName
     row.approvalStatus = approvalStatus
     $router.push({
-      path: `/lab/reportOnCredentialsApproval/detail/${row.businessId}`,
+      // path: `/lab/reportOnCredentialsApproval/detail/${row.businessId}`,
+      path: `/lab/measureData/detail/${row.businessId}`,
       query: {
         processId: row.processId,
         row: JSON.stringify(row),