diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 3dcb379..d3bd94b 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -52,3 +52,59 @@
   fileName: string
   choose: boolean
 }
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 右上角菜单
+export interface MenuType {
+  name: string
+  value: any
+}
+
+// 操作下的按钮组
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+  show?: Function // 是否显示
+}
+
+// 证书报告列表查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书号
+  customerName: string // 委托方名称
+  measureCategory: string // 检校类别
+  orderCode: string // 委托书编号
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 证书报告列表
+export interface IList {
+  id: string // 主键
+  certificateReportCode: string // 证书号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderCode: string // 委托书编号
+  measureCategory: string // 检校类别
+  measurePersonId: string // 检定人员
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  taskId: string // 任务id
+  processId: string // 流程实例id
+}

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 3dcb379..d3bd94b 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -52,3 +52,59 @@
   fileName: string
   choose: boolean
 }
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 右上角菜单
+export interface MenuType {
+  name: string
+  value: any
+}
+
+// 操作下的按钮组
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+  show?: Function // 是否显示
+}
+
+// 证书报告列表查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书号
+  customerName: string // 委托方名称
+  measureCategory: string // 检校类别
+  orderCode: string // 委托书编号
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 证书报告列表
+export interface IList {
+  id: string // 主键
+  certificateReportCode: string // 证书号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderCode: string // 委托书编号
+  measureCategory: string // 检校类别
+  measurePersonId: string // 检定人员
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  taskId: string // 任务id
+  processId: string // 流程实例id
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index 8076684..a6c774d 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -2,9 +2,8 @@
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
 import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { IdeviceList } from '../receive'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getReceiveApplyListDetail } from '@/api/device/receive'
 import type { userType } from '@/views/system/user/user-interface'
@@ -17,7 +16,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +27,6 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 3dcb379..d3bd94b 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -52,3 +52,59 @@
   fileName: string
   choose: boolean
 }
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 右上角菜单
+export interface MenuType {
+  name: string
+  value: any
+}
+
+// 操作下的按钮组
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+  show?: Function // 是否显示
+}
+
+// 证书报告列表查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书号
+  customerName: string // 委托方名称
+  measureCategory: string // 检校类别
+  orderCode: string // 委托书编号
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 证书报告列表
+export interface IList {
+  id: string // 主键
+  certificateReportCode: string // 证书号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderCode: string // 委托书编号
+  measureCategory: string // 检校类别
+  measurePersonId: string // 检定人员
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  taskId: string // 任务id
+  processId: string // 流程实例id
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index 8076684..a6c774d 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -2,9 +2,8 @@
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
 import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { IdeviceList } from '../receive'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getReceiveApplyListDetail } from '@/api/device/receive'
 import type { userType } from '@/views/system/user/user-interface'
@@ -17,7 +16,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +27,6 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 3861f14..ee710d5 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -54,7 +54,9 @@
   window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
+    console.log('=====', props.selectFormId)
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
+      console.log('获取流程详情')
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -96,6 +98,7 @@
     workFlowDef.value = works // 流程基本信息
     window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
     window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
+    console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
     workFlowStore.setTableId(tableId)
   })
 })

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 3dcb379..d3bd94b 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -52,3 +52,59 @@
   fileName: string
   choose: boolean
 }
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 右上角菜单
+export interface MenuType {
+  name: string
+  value: any
+}
+
+// 操作下的按钮组
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+  show?: Function // 是否显示
+}
+
+// 证书报告列表查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书号
+  customerName: string // 委托方名称
+  measureCategory: string // 检校类别
+  orderCode: string // 委托书编号
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 证书报告列表
+export interface IList {
+  id: string // 主键
+  certificateReportCode: string // 证书号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderCode: string // 委托书编号
+  measureCategory: string // 检校类别
+  measurePersonId: string // 检定人员
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  taskId: string // 任务id
+  processId: string // 流程实例id
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index 8076684..a6c774d 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -2,9 +2,8 @@
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
 import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { IdeviceList } from '../receive'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getReceiveApplyListDetail } from '@/api/device/receive'
 import type { userType } from '@/views/system/user/user-interface'
@@ -17,7 +16,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +27,6 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 3861f14..ee710d5 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -54,7 +54,9 @@
   window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
+    console.log('=====', props.selectFormId)
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
+      console.log('获取流程详情')
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -96,6 +98,7 @@
     workFlowDef.value = works // 流程基本信息
     window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
     window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
+    console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
     workFlowStore.setTableId(tableId)
   })
 })
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 660ac13..b9e90ab 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -5,8 +5,10 @@
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
@@ -17,7 +19,11 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 
 // 表单校验
 const rules = reactive<FormRules>({
@@ -49,8 +55,33 @@
       trigger: 'blur',
     },
   ],
+  decisionItem: [
+    {
+      required: true,
+      message: '可选决策项不能为空',
+      trigger: 'change',
+    },
+  ],
+  noticeStarter: [
+    {
+      required: true,
+      message: '审批结果是否通知发起人不能为空',
+      trigger: 'change',
+    },
+  ],
 })
 
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -62,6 +93,8 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
+      window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调setting组件的保存
       processSetting.value.saveSet()
     }
@@ -72,6 +105,9 @@
 const createProcessSuccess = () => {
   close()
 }
+onMounted(async () => {
+  await getDict()
+})
 </script>
 
 <template>
@@ -86,7 +122,7 @@
             关闭
           </el-button>
         </template>
-        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
+        <el-form ref="ruleFormRef" :model="form" label-width="180px" :rules="rules">
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
@@ -108,6 +144,42 @@
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="可选决策项:" prop="decisionItem">
+                <el-select
+                  v-model="form.decisionItem"
+                  clearable
+                  placeholder="请选择可选决策项"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in decisionItemList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审批结果是否通知发起人:" prop="noticeStarter">
+                <el-select
+                  v-model="form.noticeStarter"
+                  clearable
+                  placeholder="请选择是否通知发起人"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in noticeStarterList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
                 <el-input v-model="form.desc" type="textarea" autosize placeholder="请输入流程描述" />

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 3dcb379..d3bd94b 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -52,3 +52,59 @@
   fileName: string
   choose: boolean
 }
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 右上角菜单
+export interface MenuType {
+  name: string
+  value: any
+}
+
+// 操作下的按钮组
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+  show?: Function // 是否显示
+}
+
+// 证书报告列表查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书号
+  customerName: string // 委托方名称
+  measureCategory: string // 检校类别
+  orderCode: string // 委托书编号
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 证书报告列表
+export interface IList {
+  id: string // 主键
+  certificateReportCode: string // 证书号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderCode: string // 委托书编号
+  measureCategory: string // 检校类别
+  measurePersonId: string // 检定人员
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  taskId: string // 任务id
+  processId: string // 流程实例id
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index 8076684..a6c774d 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -2,9 +2,8 @@
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
 import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { IdeviceList } from '../receive'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getReceiveApplyListDetail } from '@/api/device/receive'
 import type { userType } from '@/views/system/user/user-interface'
@@ -17,7 +16,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +27,6 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 3861f14..ee710d5 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -54,7 +54,9 @@
   window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
+    console.log('=====', props.selectFormId)
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
+      console.log('获取流程详情')
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -96,6 +98,7 @@
     workFlowDef.value = works // 流程基本信息
     window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
     window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
+    console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
     workFlowStore.setTableId(tableId)
   })
 })
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 660ac13..b9e90ab 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -5,8 +5,10 @@
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
@@ -17,7 +19,11 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 
 // 表单校验
 const rules = reactive<FormRules>({
@@ -49,8 +55,33 @@
       trigger: 'blur',
     },
   ],
+  decisionItem: [
+    {
+      required: true,
+      message: '可选决策项不能为空',
+      trigger: 'change',
+    },
+  ],
+  noticeStarter: [
+    {
+      required: true,
+      message: '审批结果是否通知发起人不能为空',
+      trigger: 'change',
+    },
+  ],
 })
 
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -62,6 +93,8 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
+      window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调setting组件的保存
       processSetting.value.saveSet()
     }
@@ -72,6 +105,9 @@
 const createProcessSuccess = () => {
   close()
 }
+onMounted(async () => {
+  await getDict()
+})
 </script>
 
 <template>
@@ -86,7 +122,7 @@
             关闭
           </el-button>
         </template>
-        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
+        <el-form ref="ruleFormRef" :model="form" label-width="180px" :rules="rules">
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
@@ -108,6 +144,42 @@
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="可选决策项:" prop="decisionItem">
+                <el-select
+                  v-model="form.decisionItem"
+                  clearable
+                  placeholder="请选择可选决策项"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in decisionItemList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审批结果是否通知发起人:" prop="noticeStarter">
+                <el-select
+                  v-model="form.noticeStarter"
+                  clearable
+                  placeholder="请选择是否通知发起人"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in noticeStarterList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
                 <el-input v-model="form.desc" type="textarea" autosize placeholder="请输入流程描述" />
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 584d31e..0a353d0 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -1,12 +1,14 @@
 <!-- 详情 -->
 <script lang="ts" setup name="DetailProcess">
 import { reactive, ref } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['close'])
+
 // import WorkFlow from '@/components/workFlow/workFlow.vue'
 const $route = useRoute()
 const selectFormId = ref('')
@@ -16,13 +18,29 @@
   number: '', // 编号
   name: '', // 名称
   business: '', // 关联业务
+  formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 const $router = useRouter()
 // 关闭
 const close = () => {
   $router.push('/process/list')
 }
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+getDict()
 
 onMounted(() => {
   const rowData: any = $route.query.rowData
@@ -32,6 +50,12 @@
   form.value.name = getRowData.value.name
   form.value.business = getRowData.value.business
   form.value.desc = getRowData.value.describe
+  if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+    form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+  }
+  if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+    form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+  }
 })
 </script>
 
@@ -44,23 +68,68 @@
         </el-button>
       </template>
       <el-form ref="ruleFormRef" :model="form" label-width="150px">
-        <el-row :gutter="20">
+        <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="流程编号">
-              <el-input v-model="form.number" disabled type="textarea" autosize />
+            <el-form-item label="流程编号:">
+              <el-input v-model="form.number" disabled placeholder="系统自动生成" />
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流程名称:">
+              <el-input v-model="form.name" disabled placeholder="请输入流程名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="formID:">
+              <el-input v-model="form.formID" disabled placeholder="请输入formID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联业务:">
+              <el-input v-model="form.business" disabled placeholder="请输入关联业务" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="可选决策项:">
+              <el-select
+                v-model="form.decisionItem"
+                clearable
+                placeholder="请选择可选决策项"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in decisionItemList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="审批结果是否通知发起人:">
+              <el-select
+                v-model="form.noticeStarter"
+                clearable
+                placeholder="请选择是否通知发起人"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in noticeStarterList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
             <el-form-item label="流程描述">
-              <el-input v-model="form.desc" disabled type="textarea" autosize />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="流程名称">
-              <el-input v-model="form.name" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="关联业务">
-              <el-input v-model="form.business" disabled />
+              <el-input v-model="form.desc" disabled type="textarea" autosize placeholder="请输入流程描述" />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 3dcb379..d3bd94b 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -52,3 +52,59 @@
   fileName: string
   choose: boolean
 }
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 右上角菜单
+export interface MenuType {
+  name: string
+  value: any
+}
+
+// 操作下的按钮组
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+  show?: Function // 是否显示
+}
+
+// 证书报告列表查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书号
+  customerName: string // 委托方名称
+  measureCategory: string // 检校类别
+  orderCode: string // 委托书编号
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 证书报告列表
+export interface IList {
+  id: string // 主键
+  certificateReportCode: string // 证书号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderCode: string // 委托书编号
+  measureCategory: string // 检校类别
+  measurePersonId: string // 检定人员
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  taskId: string // 任务id
+  processId: string // 流程实例id
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index 8076684..a6c774d 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -2,9 +2,8 @@
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
 import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { IdeviceList } from '../receive'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getReceiveApplyListDetail } from '@/api/device/receive'
 import type { userType } from '@/views/system/user/user-interface'
@@ -17,7 +16,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +27,6 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 3861f14..ee710d5 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -54,7 +54,9 @@
   window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
+    console.log('=====', props.selectFormId)
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
+      console.log('获取流程详情')
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -96,6 +98,7 @@
     workFlowDef.value = works // 流程基本信息
     window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
     window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
+    console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
     workFlowStore.setTableId(tableId)
   })
 })
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 660ac13..b9e90ab 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -5,8 +5,10 @@
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
@@ -17,7 +19,11 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 
 // 表单校验
 const rules = reactive<FormRules>({
@@ -49,8 +55,33 @@
       trigger: 'blur',
     },
   ],
+  decisionItem: [
+    {
+      required: true,
+      message: '可选决策项不能为空',
+      trigger: 'change',
+    },
+  ],
+  noticeStarter: [
+    {
+      required: true,
+      message: '审批结果是否通知发起人不能为空',
+      trigger: 'change',
+    },
+  ],
 })
 
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -62,6 +93,8 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
+      window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调setting组件的保存
       processSetting.value.saveSet()
     }
@@ -72,6 +105,9 @@
 const createProcessSuccess = () => {
   close()
 }
+onMounted(async () => {
+  await getDict()
+})
 </script>
 
 <template>
@@ -86,7 +122,7 @@
             关闭
           </el-button>
         </template>
-        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
+        <el-form ref="ruleFormRef" :model="form" label-width="180px" :rules="rules">
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
@@ -108,6 +144,42 @@
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="可选决策项:" prop="decisionItem">
+                <el-select
+                  v-model="form.decisionItem"
+                  clearable
+                  placeholder="请选择可选决策项"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in decisionItemList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审批结果是否通知发起人:" prop="noticeStarter">
+                <el-select
+                  v-model="form.noticeStarter"
+                  clearable
+                  placeholder="请选择是否通知发起人"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in noticeStarterList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
                 <el-input v-model="form.desc" type="textarea" autosize placeholder="请输入流程描述" />
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 584d31e..0a353d0 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -1,12 +1,14 @@
 <!-- 详情 -->
 <script lang="ts" setup name="DetailProcess">
 import { reactive, ref } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['close'])
+
 // import WorkFlow from '@/components/workFlow/workFlow.vue'
 const $route = useRoute()
 const selectFormId = ref('')
@@ -16,13 +18,29 @@
   number: '', // 编号
   name: '', // 名称
   business: '', // 关联业务
+  formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 const $router = useRouter()
 // 关闭
 const close = () => {
   $router.push('/process/list')
 }
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+getDict()
 
 onMounted(() => {
   const rowData: any = $route.query.rowData
@@ -32,6 +50,12 @@
   form.value.name = getRowData.value.name
   form.value.business = getRowData.value.business
   form.value.desc = getRowData.value.describe
+  if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+    form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+  }
+  if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+    form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+  }
 })
 </script>
 
@@ -44,23 +68,68 @@
         </el-button>
       </template>
       <el-form ref="ruleFormRef" :model="form" label-width="150px">
-        <el-row :gutter="20">
+        <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="流程编号">
-              <el-input v-model="form.number" disabled type="textarea" autosize />
+            <el-form-item label="流程编号:">
+              <el-input v-model="form.number" disabled placeholder="系统自动生成" />
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流程名称:">
+              <el-input v-model="form.name" disabled placeholder="请输入流程名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="formID:">
+              <el-input v-model="form.formID" disabled placeholder="请输入formID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联业务:">
+              <el-input v-model="form.business" disabled placeholder="请输入关联业务" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="可选决策项:">
+              <el-select
+                v-model="form.decisionItem"
+                clearable
+                placeholder="请选择可选决策项"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in decisionItemList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="审批结果是否通知发起人:">
+              <el-select
+                v-model="form.noticeStarter"
+                clearable
+                placeholder="请选择是否通知发起人"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in noticeStarterList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
             <el-form-item label="流程描述">
-              <el-input v-model="form.desc" disabled type="textarea" autosize />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="流程名称">
-              <el-input v-model="form.name" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="关联业务">
-              <el-input v-model="form.business" disabled />
+              <el-input v-model="form.desc" disabled type="textarea" autosize placeholder="请输入流程描述" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 5f10748..888f4b6 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -5,8 +5,10 @@
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
@@ -17,50 +19,81 @@
   number: '', // 编号
   name: '', // 名称
   business: '', // 关联业务
+  formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
 const rules = reactive<FormRules>({
-  selectDecision: [
+  name: [
     {
       required: true,
-      message: '请选择',
+      message: '流程名称不能为空',
+      trigger: 'blur',
+    },
+  ],
+  business: [
+    {
+      required: true,
+      message: '关联业务不能为空',
+      trigger: 'blur',
+    },
+  ],
+  formID: [
+    {
+      required: true,
+      message: 'formID不能为空',
+      trigger: 'blur',
+    },
+  ],
+  desc: [
+    {
+      required: true,
+      message: '流程描述不能为空',
+      trigger: 'blur',
+    },
+  ],
+  decisionItem: [
+    {
+      required: true,
+      message: '可选决策项不能为空',
       trigger: 'change',
     },
   ],
-  rejectTo: [
+  noticeStarter: [
     {
       required: true,
-      message: '请选择',
-      trigger: 'change',
-    },
-  ],
-  changeData: [
-    {
-      required: true,
-      message: '请选择',
-      trigger: 'change',
-    },
-  ],
-  isMessage: [
-    {
-      required: true,
-      message: '请选择',
+      message: '审批结果是否通知发起人不能为空',
       trigger: 'change',
     },
   ],
 })
-
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 const $router = useRouter()
 // 关闭
 const close = () => {
   $router.back()
 }
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+getDict()
 
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
+      window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调保存接口
       processSetting.value.saveSet()
     }
@@ -74,10 +107,17 @@
   const rowData: any = $route.query.rowData
   getRowData.value = JSON.parse(rowData)
   selectFormId.value = getRowData.value.formId
+  form.value.formID = getRowData.value.formId
   form.value.number = getRowData.value.number
   form.value.name = getRowData.value.name
   form.value.business = getRowData.value.business
   form.value.desc = getRowData.value.describe
+  if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+    form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+  }
+  if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+    form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+  }
 })
 </script>
 
@@ -93,25 +133,67 @@
             关闭
           </el-button>
         </template>
-        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
-          <el-row :gutter="20">
+        <el-form ref="ruleFormRef" :model="form" label-width="180px" :rules="rules">
+          <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <el-input v-model="form.number" disabled type="textarea" autosize />
-              </el-form-item>
-              <el-form-item label="流程描述">
-                <!-- <el-input v-model="form.desc" type="textarea" /> -->
-                <el-input v-model="form.desc" disabled type="textarea" autosize />
+                <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="流程名称:">
-                <el-input v-model="form.name" disabled />
+              <el-form-item label="流程名称:" prop="name">
+                <el-input v-model="form.name" placeholder="请输入流程名称" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联业务:">
-                <el-input v-model="form.business" disabled />
+              <el-form-item label="formID:" prop="formID">
+                <el-input v-model="form.formID" placeholder="请输入formID" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="关联业务:" prop="business">
+                <el-input v-model="form.business" placeholder="请输入关联业务" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="可选决策项:" prop="decisionItem">
+                <el-select
+                  v-model="form.decisionItem"
+                  clearable
+                  placeholder="请选择可选决策项"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in decisionItemList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审批结果是否通知发起人:" prop="noticeStarter">
+                <el-select
+                  v-model="form.noticeStarter"
+                  clearable
+                  placeholder="请选择是否通知发起人"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in noticeStarterList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="流程描述" prop="desc">
+                <el-input v-model="form.desc" type="textarea" autosize placeholder="请输入流程描述" />
               </el-form-item>
             </el-col>
           </el-row>

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 3dcb379..d3bd94b 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -52,3 +52,59 @@
   fileName: string
   choose: boolean
 }
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 右上角菜单
+export interface MenuType {
+  name: string
+  value: any
+}
+
+// 操作下的按钮组
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+  show?: Function // 是否显示
+}
+
+// 证书报告列表查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书号
+  customerName: string // 委托方名称
+  measureCategory: string // 检校类别
+  orderCode: string // 委托书编号
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 证书报告列表
+export interface IList {
+  id: string // 主键
+  certificateReportCode: string // 证书号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderCode: string // 委托书编号
+  measureCategory: string // 检校类别
+  measurePersonId: string // 检定人员
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  taskId: string // 任务id
+  processId: string // 流程实例id
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index 8076684..a6c774d 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -2,9 +2,8 @@
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
 import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { IdeviceList } from '../receive'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getReceiveApplyListDetail } from '@/api/device/receive'
 import type { userType } from '@/views/system/user/user-interface'
@@ -17,7 +16,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +27,6 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 3861f14..ee710d5 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -54,7 +54,9 @@
   window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
+    console.log('=====', props.selectFormId)
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
+      console.log('获取流程详情')
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -96,6 +98,7 @@
     workFlowDef.value = works // 流程基本信息
     window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
     window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
+    console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
     workFlowStore.setTableId(tableId)
   })
 })
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 660ac13..b9e90ab 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -5,8 +5,10 @@
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
@@ -17,7 +19,11 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 
 // 表单校验
 const rules = reactive<FormRules>({
@@ -49,8 +55,33 @@
       trigger: 'blur',
     },
   ],
+  decisionItem: [
+    {
+      required: true,
+      message: '可选决策项不能为空',
+      trigger: 'change',
+    },
+  ],
+  noticeStarter: [
+    {
+      required: true,
+      message: '审批结果是否通知发起人不能为空',
+      trigger: 'change',
+    },
+  ],
 })
 
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -62,6 +93,8 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
+      window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调setting组件的保存
       processSetting.value.saveSet()
     }
@@ -72,6 +105,9 @@
 const createProcessSuccess = () => {
   close()
 }
+onMounted(async () => {
+  await getDict()
+})
 </script>
 
 <template>
@@ -86,7 +122,7 @@
             关闭
           </el-button>
         </template>
-        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
+        <el-form ref="ruleFormRef" :model="form" label-width="180px" :rules="rules">
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
@@ -108,6 +144,42 @@
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="可选决策项:" prop="decisionItem">
+                <el-select
+                  v-model="form.decisionItem"
+                  clearable
+                  placeholder="请选择可选决策项"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in decisionItemList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审批结果是否通知发起人:" prop="noticeStarter">
+                <el-select
+                  v-model="form.noticeStarter"
+                  clearable
+                  placeholder="请选择是否通知发起人"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in noticeStarterList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
                 <el-input v-model="form.desc" type="textarea" autosize placeholder="请输入流程描述" />
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 584d31e..0a353d0 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -1,12 +1,14 @@
 <!-- 详情 -->
 <script lang="ts" setup name="DetailProcess">
 import { reactive, ref } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['close'])
+
 // import WorkFlow from '@/components/workFlow/workFlow.vue'
 const $route = useRoute()
 const selectFormId = ref('')
@@ -16,13 +18,29 @@
   number: '', // 编号
   name: '', // 名称
   business: '', // 关联业务
+  formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 const $router = useRouter()
 // 关闭
 const close = () => {
   $router.push('/process/list')
 }
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+getDict()
 
 onMounted(() => {
   const rowData: any = $route.query.rowData
@@ -32,6 +50,12 @@
   form.value.name = getRowData.value.name
   form.value.business = getRowData.value.business
   form.value.desc = getRowData.value.describe
+  if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+    form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+  }
+  if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+    form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+  }
 })
 </script>
 
@@ -44,23 +68,68 @@
         </el-button>
       </template>
       <el-form ref="ruleFormRef" :model="form" label-width="150px">
-        <el-row :gutter="20">
+        <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="流程编号">
-              <el-input v-model="form.number" disabled type="textarea" autosize />
+            <el-form-item label="流程编号:">
+              <el-input v-model="form.number" disabled placeholder="系统自动生成" />
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流程名称:">
+              <el-input v-model="form.name" disabled placeholder="请输入流程名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="formID:">
+              <el-input v-model="form.formID" disabled placeholder="请输入formID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联业务:">
+              <el-input v-model="form.business" disabled placeholder="请输入关联业务" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="可选决策项:">
+              <el-select
+                v-model="form.decisionItem"
+                clearable
+                placeholder="请选择可选决策项"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in decisionItemList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="审批结果是否通知发起人:">
+              <el-select
+                v-model="form.noticeStarter"
+                clearable
+                placeholder="请选择是否通知发起人"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in noticeStarterList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
             <el-form-item label="流程描述">
-              <el-input v-model="form.desc" disabled type="textarea" autosize />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="流程名称">
-              <el-input v-model="form.name" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="关联业务">
-              <el-input v-model="form.business" disabled />
+              <el-input v-model="form.desc" disabled type="textarea" autosize placeholder="请输入流程描述" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 5f10748..888f4b6 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -5,8 +5,10 @@
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
@@ -17,50 +19,81 @@
   number: '', // 编号
   name: '', // 名称
   business: '', // 关联业务
+  formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
 const rules = reactive<FormRules>({
-  selectDecision: [
+  name: [
     {
       required: true,
-      message: '请选择',
+      message: '流程名称不能为空',
+      trigger: 'blur',
+    },
+  ],
+  business: [
+    {
+      required: true,
+      message: '关联业务不能为空',
+      trigger: 'blur',
+    },
+  ],
+  formID: [
+    {
+      required: true,
+      message: 'formID不能为空',
+      trigger: 'blur',
+    },
+  ],
+  desc: [
+    {
+      required: true,
+      message: '流程描述不能为空',
+      trigger: 'blur',
+    },
+  ],
+  decisionItem: [
+    {
+      required: true,
+      message: '可选决策项不能为空',
       trigger: 'change',
     },
   ],
-  rejectTo: [
+  noticeStarter: [
     {
       required: true,
-      message: '请选择',
-      trigger: 'change',
-    },
-  ],
-  changeData: [
-    {
-      required: true,
-      message: '请选择',
-      trigger: 'change',
-    },
-  ],
-  isMessage: [
-    {
-      required: true,
-      message: '请选择',
+      message: '审批结果是否通知发起人不能为空',
       trigger: 'change',
     },
   ],
 })
-
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 const $router = useRouter()
 // 关闭
 const close = () => {
   $router.back()
 }
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+getDict()
 
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
+      window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调保存接口
       processSetting.value.saveSet()
     }
@@ -74,10 +107,17 @@
   const rowData: any = $route.query.rowData
   getRowData.value = JSON.parse(rowData)
   selectFormId.value = getRowData.value.formId
+  form.value.formID = getRowData.value.formId
   form.value.number = getRowData.value.number
   form.value.name = getRowData.value.name
   form.value.business = getRowData.value.business
   form.value.desc = getRowData.value.describe
+  if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+    form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+  }
+  if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+    form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+  }
 })
 </script>
 
@@ -93,25 +133,67 @@
             关闭
           </el-button>
         </template>
-        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
-          <el-row :gutter="20">
+        <el-form ref="ruleFormRef" :model="form" label-width="180px" :rules="rules">
+          <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <el-input v-model="form.number" disabled type="textarea" autosize />
-              </el-form-item>
-              <el-form-item label="流程描述">
-                <!-- <el-input v-model="form.desc" type="textarea" /> -->
-                <el-input v-model="form.desc" disabled type="textarea" autosize />
+                <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="流程名称:">
-                <el-input v-model="form.name" disabled />
+              <el-form-item label="流程名称:" prop="name">
+                <el-input v-model="form.name" placeholder="请输入流程名称" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联业务:">
-                <el-input v-model="form.business" disabled />
+              <el-form-item label="formID:" prop="formID">
+                <el-input v-model="form.formID" placeholder="请输入formID" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="关联业务:" prop="business">
+                <el-input v-model="form.business" placeholder="请输入关联业务" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="可选决策项:" prop="decisionItem">
+                <el-select
+                  v-model="form.decisionItem"
+                  clearable
+                  placeholder="请选择可选决策项"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in decisionItemList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审批结果是否通知发起人:" prop="noticeStarter">
+                <el-select
+                  v-model="form.noticeStarter"
+                  clearable
+                  placeholder="请选择是否通知发起人"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in noticeStarterList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="流程描述" prop="desc">
+                <el-input v-model="form.desc" type="textarea" autosize placeholder="请输入流程描述" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index 6ab1ed5..2e183f8 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -12,13 +12,20 @@
   offset: number
   limit: number
 }
-
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
 export interface Iform {
   number: string // 编号
   name: string // 名称
   business: string // 关联业务
   desc?: string // 流程描述
   formID?: string
+  decisionItem: string // 可选决策项
+  noticeStarter: string // 审批结果是否通知发起人
 }
 
 // 关联业务列表

diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
index f76a9ce..b67ab35 100644
--- a/src/api/business/lab/environmentRecord.ts
+++ b/src/api/business/lab/environmentRecord.ts
@@ -1,3 +1,6 @@
+/**
+ * 环境记录单接口
+*/
 import request from '../../index'
 import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
 const prefix = '/business/environmentRecord'
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index 1d63e01..f8143b7 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -33,3 +33,30 @@
   })
 }
 
+// 新建
+export function addPrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updatePrimitiveLog(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取详情
+export function getPrimitiveLogDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
new file mode 100644
index 0000000..a027580
--- /dev/null
+++ b/src/api/business/lab/report.ts
@@ -0,0 +1,71 @@
+/**
+ * 证书报告接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/reportOnCredentials/report_interface'
+const prefix = '/business/certificateReport'
+
+// 列表查询
+export function getReportList(data: IListQuery) {
+  return request({
+    url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReportList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deleteReportList(data: { id: string }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submitReportList(data: { id: string; formId: string }) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// // 新建
+// export function addPrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/add`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 编辑
+// export function updatePrimitiveLog(data: any) {
+//   return request({
+//     url: `${prefix}/update`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// // 获取详情
+// export function getPrimitiveLogDetail(data: { id: string }) {
+//   return request({
+//     url: `${prefix}/detail`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b64df84..6fdad69 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -141,23 +141,23 @@
     return
   }
 
-  console.log('pppppppp', decisionItem.value)
+  // console.log('pppppppp', decisionItem.value)
 
-  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
-    ElMessage({
-      message: '请选择决策项',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+  //   ElMessage({
+  //     message: '请选择决策项',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
-  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
-    ElMessage({
-      message: '请选择审批结果是否通知发起人',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+  //   ElMessage({
+  //     message: '请选择审批结果是否通知发起人',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
 
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
@@ -286,7 +286,7 @@
       </el-radio-group>
 
       <!-- 可选决策项 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         可选决策项
       </h5>
       <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
@@ -299,10 +299,10 @@
         <el-radio :label="3">
           拒绝
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 审批结果通知发起人 -->
-      <h5 class="add-person">
+      <!-- <h5 class="add-person">
         审批结果通知发起人
       </h5>
       <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
@@ -312,7 +312,7 @@
         <el-radio :label="0">
           否
         </el-radio>
-      </el-radio-group>
+      </el-radio-group> -->
 
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index e1c4d7d..214d0bd 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -4,9 +4,9 @@
 
 const routes: Route.recordRaw[] = [
   {
-    path: '/business',
+    path: '/businessManage',
     component: Layout,
-    redirect: '/business/bench',
+    redirect: '/businessManage/bench',
     name: 'BussinessBench',
     meta: {
       title: '工作台',
@@ -23,7 +23,7 @@
           auth: '/business/bench',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessManage',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 6f516aa..bc5ae04 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -242,9 +242,9 @@
     ],
   },
   {
-    path: '/business',
+    path: '/businessLog',
     component: Layout,
-    redirect: '/business/list',
+    redirect: '/businessLog/list',
     name: 'BusinessLog',
     meta: {
       title: '业务日志',
@@ -261,7 +261,7 @@
           auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/business',
+          activeMenu: '/businessLog',
         },
       },
     ],
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 10df50e..6b11916 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -4,7 +4,9 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { listPageApi } from '@/api/device/standingBook'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { fileListType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 
 const props = defineProps({
   visible: {
@@ -15,36 +17,34 @@
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
 // 查询条件
-const searchQuery = ref({
-  equipmentNo: '', // 设备编号
-  equipmentName: '', // 名称
-  mesureType: '', // 检定方式
-  managerState: '1', // 管理状态 1表示在用（启封）
-  useDept: '', // 使用部门
-  assetType: '1', // 资产类型 1表示测量设备
-  equipmentCategory: '', // 设备类别
-  isCalibrationTestEquipment: '', // 校准/检定设备
-  isMeasureAccount: '', // 测量工装
-  isStandardSupportEquipment: '', // 标准配套设备
-  isFixedAssets: '', // 固定资产
-  validStartDate: '', // 有效开始日期
-  validEndDate: '', // 有效结束日期
-  abc: '',
+const searchQuery = ref<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  // publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  // effectiveTime: '', // 实施时间
+  effectiveStatus: '1', // 实施状态--1：在用
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
-  // ids: [] as string[],
+  fileType: '10', // 类型--10:计量规程
+  ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
+  { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ])
 // 表格数据
-const list = ref<fixedAssetsType[]>([])
+const list = ref<fileListType[]>([])
 // 总数
 const total = ref(0)
 // 表格加载状态
@@ -61,12 +61,7 @@
   }
   listPageApi(searchQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -91,23 +86,21 @@
 // 点击重置
 const clearList = () => {
   searchQuery.value = {
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 名称
-    mesureType: '', // 检定方式
-    managerState: '', // 管理状态
-    useDept: '', // 使用部门
-    assetType: '1', // 资产类型 1表示测量设备
-    equipmentCategory: '', // 设备类别
-    isCalibrationTestEquipment: '', // 校准/检定设备
-    isMeasureAccount: '', // 测量工装
-    isStandardSupportEquipment: '', // 标准配套设备
-    isFixedAssets: '', // 固定资产
-    validStartDate: '', // 有效开始日期
-    validEndDate: '', // 有效结束日期
-    abc: '',
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    // publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    // effectiveTime: '', // 实施时间
+    effectiveStatus: '1', // 实施状态--1：在用
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    publishEndTime: '',
+    publishStartTime: '',
     limit: 20,
     offset: 1,
-  // ids: [] as string[],
+    fileType: '10', // 类型--10:计量规程
+    ids: [] as string[],
+    formId: SCHEDULE.FILE_APPROVAL,
   }
   fetchData(true)
 }
@@ -129,7 +122,7 @@
 }
 
 // 点击确定
-const clickConfirmSample = () => {
+const clickConfirm = () => {
   if (!checkoutList.value.length) {
     ElMessage({
       message: '请选中',
@@ -156,10 +149,13 @@
         @search="searchList" @clear="clearList"
       >
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
       </search-area>
       <normal-table
@@ -171,7 +167,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -183,7 +179,7 @@
         </template>
       </normal-table>
       <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
+        <el-button type="primary" @click="clickConfirm">
           确定
         </el-button>
         <el-button @click="cancle">
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 0b4fecf..1ff5620 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -70,7 +70,7 @@
       list.value = res.data.rows.map((item: fixedAssetsType) => {
         return {
           ...item,
-          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
         }
       })
       total.value = res.data.total
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index d663752..4b2730e 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -292,7 +292,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index ad1a2c7..60385b9 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,59 +1,47 @@
+<!-- 原始记录新建、编辑、详情 -->
 <script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import SampleDialog from '../components/sampleDialog.vue'
 import selectSample from '../components/selectSample.vue'
 import selectTemplate from '../components/selectTemplate.vue'
 import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import SelectFiles from '../components/selectFiles.vue'
 import type { columnsType, dictType } from './primitiveLogList'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
-import {
-  getStandardLisAdd,
-  getStandardLisdetali,
-  getStandardListDetail,
-  getUsersDept,
-  submitStandardEquipmentApply,
-  updateStandardEquipmentApply,
-} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
 import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
-import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
-import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
+import type { fileListType } from '@/views/measure/file/file-interface'
+import { addPrimitiveLog, getPrimitiveLogDetail, updatePrimitiveLog } from '@/api/business/lab/primitiveLogList'
+const infoId = ref('') // id-原始记录列表id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const orderVisible = ref(false) // 控制委托书对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
+// 路由参数
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.query.formId as string
-  if ($route.query.id) {
-    infoId.value = $route.query.id as string
-  }
+  infoId.value = $route.params.id as string
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
@@ -84,6 +72,8 @@
     customerName: '', // 委托方名称
     customerPhone: '', // 委托方电话
     customerAddress: '', // 委托方地址
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
   },
   customerSampleInfo: { // 样品信息
     sampleNo: '', // 样品编号
@@ -93,62 +83,10 @@
     manufacturer: '', // 生产厂家
     deliverer: '', // 送检人
     delivererTel: '', // 送检人联系方式
-    planDeliverTime: '', // 预计送达时间
-    requireOverTime: '', // 要求检完时间
     measureContent: '', // 检定项目
   },
-  fixedAssetsList: [] as any, // 测量设备
-})
-// 数据详情无需上传--用于显示详情
-const fromListInfo = ref({
-  environmentCode: '', // 环境记录单编号
-  calibrationLocation: '', // 校验地点
-  temperature: '', // 环境记录单温度
-  humidity: '', // 环境记录单相对湿度
-  orderCode: '', // 委托书编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerAddress: '', // 委托方地址
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  manufacturingNo: '', // 出厂编号
-  sampleModel: '', // 型号
-  manufacturer: '', // 生产厂家
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  submissionTime: '', // 预计送达时间
-  inspectionTime: '', // 要求检完时间
-  measureContent: '', // 检定项目
-  templateId: '', // 原始记录模板id
-  originalRecordFile: '', // 原始记录附件
-  sampleId: '', // 样品id
-  orderId: '', // 委托书id
-  fixedAssetsList: [], // 底部设备数组
-  fileList: [], // 底部文件表格数组
-  applyEquipmentList: [], // 底部设备详情数组
-  businessEnvironmentRecord: {}, // 环境记录单信息
-})
-
-// 数据
-const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
 // 所用设备表头
@@ -166,6 +104,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -196,26 +135,20 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -223,31 +156,17 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
@@ -256,7 +175,7 @@
   'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
-  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'calibrationPlace': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
@@ -276,22 +195,6 @@
   'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-// 底部文件选择下标收集类型
-interface arowReturnType {
-  $index: number
-}
-const uploadIndex = (row: arowReturnType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
 
 // 获取字典值
 async function getDict() {
@@ -300,45 +203,6 @@
   mesureCategoryList.value = response.data
 }
 
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({})
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: object) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({})
-  }
-}
-
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -368,77 +232,38 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 获取详情信息
-const getInfo = (id: string | number) => {
-  getStandardLisdetali({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-  })
-}
-if (pageType.value !== 'add') {
-  // getInfo(infoId.value)
-}
-
-// 保存后的id
-const addId = ref('')
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // getListSave(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+        if (pageType.value === 'add') { // 新建
+          addPrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          updatePrimitiveLog(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功！')
+              close()
+            }
+          })
+        }
       })
     }
   })
 }
 
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// ----------------------------选择环境记录单------------------------------------
+// -------------------------------选择环境记录单----------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
@@ -451,7 +276,7 @@
   formInline.value.businessEnvironmentRecord = data // 环境记录单信息
 }
 
-// ---------------------------------委托书---------------------------------------
+// ------------------------------------委托书------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -468,7 +293,7 @@
     formInline.value.businessOrder = val[0]
   }
 }
-// -----------------------------------样品----------------------------------------
+// --------------------------------------样品-------------------------------------------
 // 点击选择样品
 const handleClickSample = () => {
   if (!formInline.value.orderId) {
@@ -490,7 +315,7 @@
   }
 }
 
-// -----------------------------------原始记录模板-------------------------------
+// --------------------------------------原始记录模板-----------------------------------
 // 选择环境记录单Ref
 const templateDialog = ref()
 // 选择环境记录单
@@ -499,22 +324,20 @@
 }
 // 选择环境记录单表格确认
 const confirmCheckoutTemplate = (val: any) => {
-  // formInline.value.environmentId = data.id // 环境记录单id
-  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
 }
 
-// -------------------------------------所用设备-----------------------------------
+// ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
     !item.equipmentNo && !item.equipmentName)
   if (index !== -1) {
     ElMessage.warning('请完善上一条设备信息')
     return
   }
-  formInline.value.fixedAssetsList.push({
+  formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
     equipmentNo: '', // 设备编号
     modelNo: '', // 型号
@@ -523,6 +346,10 @@
   })
 }
 
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
 // 点击所用设备删除行
 const delMeasureDeviceRow = () => {
   if (checkoutMeasureDeviceList.value.length <= 0) {
@@ -533,9 +360,9 @@
   }
   else {
     checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
         if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.fixedAssetsList.splice(index, 1)
+          formInline.value.equipmentInfoList.splice(index, 1)
         }
       })
     })
@@ -553,109 +380,110 @@
 }
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
-  console.log('------')
-  console.log(val)
-
   if (val && val.length) {
-    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
     if (index !== -1) {
       ElMessage.warning('此设备已添加过')
       return
     }
-    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
   }
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
       type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
     })
   }
   else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 标准装置发生改变data类型
-interface dataReturn {
-  id: string
-}
-// 获取详情信息
-const getStandarInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof res.data[item] === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
     })
-    formInline.value = res.data
-  })
+  }
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
 }
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '原始记录模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '原始记录详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>原始记录详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
+// 获取详情信息
+const fetchDetail = () => {
+  if (infoId.value) {
+    getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
+      formInline.value = res.data
+      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    })
+  }
+}
+
 onMounted(() => {
   getDict() // 获取字典
+  if (pageType.value === 'edit' || pageType.value === 'detail') {
+    fetchDetail()
+  }
 })
 </script>
 
@@ -666,11 +494,9 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="save(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -721,9 +547,9 @@
               >
                 <el-option
                   v-for="item in mesureCategoryList"
-                  :key="item.id"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -745,10 +571,10 @@
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
-              prop="calibrationLocation"
+              prop="calibrationPlace"
             >
               <el-input
-                v-model.trim="fromListInfo.calibrationLocation"
+                v-model.trim="formInline.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -952,7 +778,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.planDeliverTime"
+                v-model="formInline.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -966,7 +792,7 @@
           <el-col :span="6">
             <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="formInline.customerSampleInfo.requireOverTime"
+                v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
@@ -980,9 +806,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="measureContent">
+            <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.measureContent"
+                v-model.trim="formInline.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1054,10 +880,10 @@
         </el-button>
       </template>
       <el-table
-        :data="formInline.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1089,6 +915,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  type="primary"
                   @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
@@ -1101,18 +928,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1125,6 +952,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1143,6 +971,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1163,6 +992,8 @@
   <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 5bf6f0f..4f29225 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -1,34 +1,15 @@
+<!-- 证书报告列表页 -->
 <script lang="ts" setup name="reportOnCredentialsApproval">
-// 溯源供方审批列表
-import ListApproval from './reportOnCredentialsList.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
-
+import ListApproval from './reportOnCredentialsList.vue'
+import type { IButton, MenuType, dictType } from './report_interface'
+import { getDictByCode } from '@/api/system/dict'
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -61,7 +42,8 @@
     { name: '删除', type: 'danger' },
   ],
 
-}
+} // 操作按钮组
+
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,10 +51,32 @@
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
-// 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 
 const $route = useRoute()
+// 路由参数
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
   if (currentMenu) {
@@ -80,7 +84,7 @@
   }
 }
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a0aee10..0cfcb0e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -1,68 +1,64 @@
+<!-- 证书报告列表  -->
 <script lang="ts" setup name="ReportOnCredentialslist">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
-// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
-
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
-const listQuery = ref({
-  approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  testCategory: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+const listQuery = ref<IListQuery>({
+  approvalStatus: '0', // 审批状态 -- 全部
+  certificateReportCode: '', // 证书号
+  customerName: '', // 委托方名称
+  measureCategory: '', // 检校类别
+  orderCode: '', // 委托书编号
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
-const list = ref([{ name: '张三', id: '1' }])
+const list = ref<IList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'name', align: 'center' },
-  { text: '证书名称', value: 'name', width: '120', align: 'center' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center' },
-  { text: '型号', value: 'name', align: 'center' },
-  { text: '出厂编号', value: 'name', align: 'center' },
-  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
-  { text: '检校类别', value: 'name', align: 'center' },
-  { text: '检定人员', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'name', align: 'center' },
-  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -71,29 +67,30 @@
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
 const loadingTable = ref(false)
-// 发送请求
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 获取列表数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getReportList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
-// fetchData(true)
-// 多选发生改变时
+
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
@@ -103,8 +100,9 @@
   supplierName: string
 }
 const buttonTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+
+// 点击删除
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -114,7 +112,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    deleteReportList({ id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -125,18 +123,10 @@
     })
   })
 }
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -149,13 +139,10 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
+      cancelApproval(params).then(() => {
+        ElMessage.success('已取消')
       })
+      fetchData(true)
     })
 }
 
@@ -165,48 +152,53 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    testCategory: '',
-    formId: SCHEDULE.SUPPLIER_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    approvalStatus: props.status, // 审批状态
+    certificateReportCode: '', // 证书号
+    customerName: '', // 委托方名称
+    measureCategory: '', // 检校类别
+    orderCode: '', // 委托书编号
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     offset: 1,
     limit: 20,
   }
   fetchData(true)
 }
+
 // 导出
 const exportExcelBtn = () => {
-  const params: supplierExportQuery = {
-    approvalStatus: listQuery.value.approvalStatus,
-    businessContent: listQuery.value.businessContent,
-    companyArea: listQuery.value.companyArea,
-    companyCity: listQuery.value.companyCity,
-    companyProvince: listQuery.value.companyProvince,
-    formId: listQuery.value.formId,
-    supplierName: listQuery.value.supplierName,
-    supplierNo: listQuery.value.supplierNo,
-  }
-  if (checkoutList.value.length > 0) {
-    params.ids = checkoutList.value
-  }
-  // TODO: 审批列表导出
-  console.log(params)
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: listQuery.value.approvalStatus, // 审批状态
+      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
+      customerName: listQuery.value.customerName, // 委托方名称
+      measureCategory: listQuery.value.measureCategory, // 检校类别
+      orderCode: listQuery.value.orderCode, // 委托书编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportReportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书报告列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -218,11 +210,11 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  // fetchData(true)
+  fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
+const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
+  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
 }
 // 新建证书报告
 const add = () => {
@@ -234,41 +226,36 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  // fetchData(true)
+  fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
       if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
+        ElMessage.success('已提交')
         fetchData(true)
       }
     })
   })
 }
+
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
-      goDetail(row)
+      goDetail(row, 'detail')
       break
     case '提交':
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
+      goDetail(row, 'edit')
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -289,14 +276,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (
-  () => props.status,
-  (newVal: string) => {
-    console.log('change status')
-    listQuery.value.approvalStatus = newVal
-    // fetchData(false)
-  },
-  { immediate: true })
+watch (() => props.status, (newVal, oldVal) => {
+  listQuery.value.approvalStatus = newVal!
+  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
+  fetchData(true)
+},
+// { immediate: true },
+)
+
 // 打印列表
 function printList() {
   // 打印列
@@ -309,94 +296,93 @@
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
     printJSON(list.value, properties, '证书报告列表')
   }
-  // else if (checkoutList.value.length > 0) {
-  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
-  //   printJSON(printList, properties, '证书报告列表')
-  // }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
 
-onActivated(() => {
-  // fetchData(true)
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
 })
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.certificateReportCode" placeholder="证书号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.orderCode" 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.sampleNo" placeholder="样品编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="请选择检校类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 3dcb379..d3bd94b 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -52,3 +52,59 @@
   fileName: string
   choose: boolean
 }
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 右上角菜单
+export interface MenuType {
+  name: string
+  value: any
+}
+
+// 操作下的按钮组
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+  show?: Function // 是否显示
+}
+
+// 证书报告列表查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书号
+  customerName: string // 委托方名称
+  measureCategory: string // 检校类别
+  orderCode: string // 委托书编号
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 证书报告列表
+export interface IList {
+  id: string // 主键
+  certificateReportCode: string // 证书号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderCode: string // 委托书编号
+  measureCategory: string // 检校类别
+  measurePersonId: string // 检定人员
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  taskId: string // 任务id
+  processId: string // 流程实例id
+}
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index 8076684..a6c774d 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -2,9 +2,8 @@
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
-import type { Ref } from 'vue'
 import dayjs from 'dayjs'
-import type { IdeviceList, IdeviceListQuery } from '../receive'
+import type { IdeviceList } from '../receive'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getReceiveApplyListDetail } from '@/api/device/receive'
 import type { userType } from '@/views/system/user/user-interface'
@@ -17,7 +16,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +27,6 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 3861f14..ee710d5 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -54,7 +54,9 @@
   window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
+    console.log('=====', props.selectFormId)
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
+      console.log('获取流程详情')
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -96,6 +98,7 @@
     workFlowDef.value = works // 流程基本信息
     window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
     window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
+    console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
     workFlowStore.setTableId(tableId)
   })
 })
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 660ac13..b9e90ab 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -5,8 +5,10 @@
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
@@ -17,7 +19,11 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 
 // 表单校验
 const rules = reactive<FormRules>({
@@ -49,8 +55,33 @@
       trigger: 'blur',
     },
   ],
+  decisionItem: [
+    {
+      required: true,
+      message: '可选决策项不能为空',
+      trigger: 'change',
+    },
+  ],
+  noticeStarter: [
+    {
+      required: true,
+      message: '审批结果是否通知发起人不能为空',
+      trigger: 'change',
+    },
+  ],
 })
 
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -62,6 +93,8 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
+      window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调setting组件的保存
       processSetting.value.saveSet()
     }
@@ -72,6 +105,9 @@
 const createProcessSuccess = () => {
   close()
 }
+onMounted(async () => {
+  await getDict()
+})
 </script>
 
 <template>
@@ -86,7 +122,7 @@
             关闭
           </el-button>
         </template>
-        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
+        <el-form ref="ruleFormRef" :model="form" label-width="180px" :rules="rules">
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
@@ -108,6 +144,42 @@
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="可选决策项:" prop="decisionItem">
+                <el-select
+                  v-model="form.decisionItem"
+                  clearable
+                  placeholder="请选择可选决策项"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in decisionItemList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审批结果是否通知发起人:" prop="noticeStarter">
+                <el-select
+                  v-model="form.noticeStarter"
+                  clearable
+                  placeholder="请选择是否通知发起人"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in noticeStarterList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
                 <el-input v-model="form.desc" type="textarea" autosize placeholder="请输入流程描述" />
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 584d31e..0a353d0 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -1,12 +1,14 @@
 <!-- 详情 -->
 <script lang="ts" setup name="DetailProcess">
 import { reactive, ref } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import Setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['close'])
+
 // import WorkFlow from '@/components/workFlow/workFlow.vue'
 const $route = useRoute()
 const selectFormId = ref('')
@@ -16,13 +18,29 @@
   number: '', // 编号
   name: '', // 名称
   business: '', // 关联业务
+  formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 const $router = useRouter()
 // 关闭
 const close = () => {
   $router.push('/process/list')
 }
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+getDict()
 
 onMounted(() => {
   const rowData: any = $route.query.rowData
@@ -32,6 +50,12 @@
   form.value.name = getRowData.value.name
   form.value.business = getRowData.value.business
   form.value.desc = getRowData.value.describe
+  if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+    form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+  }
+  if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+    form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+  }
 })
 </script>
 
@@ -44,23 +68,68 @@
         </el-button>
       </template>
       <el-form ref="ruleFormRef" :model="form" label-width="150px">
-        <el-row :gutter="20">
+        <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="流程编号">
-              <el-input v-model="form.number" disabled type="textarea" autosize />
+            <el-form-item label="流程编号:">
+              <el-input v-model="form.number" disabled placeholder="系统自动生成" />
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流程名称:">
+              <el-input v-model="form.name" disabled placeholder="请输入流程名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="formID:">
+              <el-input v-model="form.formID" disabled placeholder="请输入formID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联业务:">
+              <el-input v-model="form.business" disabled placeholder="请输入关联业务" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="可选决策项:">
+              <el-select
+                v-model="form.decisionItem"
+                clearable
+                placeholder="请选择可选决策项"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in decisionItemList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="审批结果是否通知发起人:">
+              <el-select
+                v-model="form.noticeStarter"
+                clearable
+                placeholder="请选择是否通知发起人"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in noticeStarterList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
             <el-form-item label="流程描述">
-              <el-input v-model="form.desc" disabled type="textarea" autosize />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="流程名称">
-              <el-input v-model="form.name" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="关联业务">
-              <el-input v-model="form.business" disabled />
+              <el-input v-model="form.desc" disabled type="textarea" autosize placeholder="请输入流程描述" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 5f10748..888f4b6 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -5,8 +5,10 @@
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
 import setting from '../../setting.vue'
-import type { Iform } from './process'
+import type { Iform, dictType } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
@@ -17,50 +19,81 @@
   number: '', // 编号
   name: '', // 名称
   business: '', // 关联业务
+  formID: '', // formID
   desc: '', // 流程描述
+  decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝
+  noticeStarter: '', // 审批结果是否通知发起人
 })
 const rules = reactive<FormRules>({
-  selectDecision: [
+  name: [
     {
       required: true,
-      message: '请选择',
+      message: '流程名称不能为空',
+      trigger: 'blur',
+    },
+  ],
+  business: [
+    {
+      required: true,
+      message: '关联业务不能为空',
+      trigger: 'blur',
+    },
+  ],
+  formID: [
+    {
+      required: true,
+      message: 'formID不能为空',
+      trigger: 'blur',
+    },
+  ],
+  desc: [
+    {
+      required: true,
+      message: '流程描述不能为空',
+      trigger: 'blur',
+    },
+  ],
+  decisionItem: [
+    {
+      required: true,
+      message: '可选决策项不能为空',
       trigger: 'change',
     },
   ],
-  rejectTo: [
+  noticeStarter: [
     {
       required: true,
-      message: '请选择',
-      trigger: 'change',
-    },
-  ],
-  changeData: [
-    {
-      required: true,
-      message: '请选择',
-      trigger: 'change',
-    },
-  ],
-  isMessage: [
-    {
-      required: true,
-      message: '请选择',
+      message: '审批结果是否通知发起人不能为空',
       trigger: 'change',
     },
   ],
 })
-
+const decisionItemList = ref<dictType[]>([]) // 可选决策项
+const noticeStarterList = ref<dictType[]>([]) // 可选决策项
 const $router = useRouter()
 // 关闭
 const close = () => {
   $router.back()
 }
+// 获取字典值
+async function getDict() {
+  // 可选决策项
+  const response = await getDictByCode('decisionItem')
+  decisionItemList.value = response.data
+
+  // 审批结果是否通知发起人
+  const res = await getDictByCode('noticeStarter')
+  noticeStarterList.value = res.data
+}
+getDict()
 
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
+      window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调保存接口
       processSetting.value.saveSet()
     }
@@ -74,10 +107,17 @@
   const rowData: any = $route.query.rowData
   getRowData.value = JSON.parse(rowData)
   selectFormId.value = getRowData.value.formId
+  form.value.formID = getRowData.value.formId
   form.value.number = getRowData.value.number
   form.value.name = getRowData.value.name
   form.value.business = getRowData.value.business
   form.value.desc = getRowData.value.describe
+  if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+    form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+  }
+  if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+    form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+  }
 })
 </script>
 
@@ -93,25 +133,67 @@
             关闭
           </el-button>
         </template>
-        <el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules">
-          <el-row :gutter="20">
+        <el-form ref="ruleFormRef" :model="form" label-width="180px" :rules="rules">
+          <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <el-input v-model="form.number" disabled type="textarea" autosize />
-              </el-form-item>
-              <el-form-item label="流程描述">
-                <!-- <el-input v-model="form.desc" type="textarea" /> -->
-                <el-input v-model="form.desc" disabled type="textarea" autosize />
+                <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="流程名称:">
-                <el-input v-model="form.name" disabled />
+              <el-form-item label="流程名称:" prop="name">
+                <el-input v-model="form.name" placeholder="请输入流程名称" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联业务:">
-                <el-input v-model="form.business" disabled />
+              <el-form-item label="formID:" prop="formID">
+                <el-input v-model="form.formID" placeholder="请输入formID" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="关联业务:" prop="business">
+                <el-input v-model="form.business" placeholder="请输入关联业务" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="可选决策项:" prop="decisionItem">
+                <el-select
+                  v-model="form.decisionItem"
+                  clearable
+                  placeholder="请选择可选决策项"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in decisionItemList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审批结果是否通知发起人:" prop="noticeStarter">
+                <el-select
+                  v-model="form.noticeStarter"
+                  clearable
+                  placeholder="请选择是否通知发起人"
+                  size="default"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="item in noticeStarterList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="流程描述" prop="desc">
+                <el-input v-model="form.desc" type="textarea" autosize placeholder="请输入流程描述" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index 6ab1ed5..2e183f8 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -12,13 +12,20 @@
   offset: number
   limit: number
 }
-
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
 export interface Iform {
   number: string // 编号
   name: string // 名称
   business: string // 关联业务
   desc?: string // 流程描述
   formID?: string
+  decisionItem: string // 可选决策项
+  noticeStarter: string // 审批结果是否通知发起人
 }
 
 // 关联业务列表
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 2edd4c1..1d69fe0 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -7,6 +7,7 @@
 import { delProcessList, exportProcessList, getBusinessList, getProcessList, updateState } from '@/api/system/process'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { getDictByCode } from '@/api/system/dict'
 
 const { proxy } = getCurrentInstance() as any
 const businessList = ref<IBusinessList[]>([]) // 关联业务列表