diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 973afbf..137aa0f 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -24,6 +24,10 @@
     type: Boolean,
     default: false,
   },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -34,7 +38,7 @@
   orderCode: '',	// 原始记录单编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
-  customerNo: '', // 委托方id
+  customerNo: '', // 委托方编号、委托方代码
   customerName: '', // 委托方名称
   startTime: '',
   endTime: '',
@@ -45,8 +49,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
@@ -69,6 +73,7 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -137,6 +142,8 @@
 
 watch(() => props.visible, (newValue) => {
   if (newValue) {
+    console.log('pppp', props.customerNo)
+
     fetchData(true)
   }
 })
@@ -150,7 +157,7 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <search-item>
+        <!-- <search-item>
           <el-input
             v-model.trim="listQuery.customerNo"
             placeholder="委托方编号"
@@ -165,7 +172,7 @@
             class="short-input"
             clearable
           />
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-input
             v-model.trim="listQuery.sampleNo"

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 973afbf..137aa0f 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -24,6 +24,10 @@
     type: Boolean,
     default: false,
   },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -34,7 +38,7 @@
   orderCode: '',	// 原始记录单编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
-  customerNo: '', // 委托方id
+  customerNo: '', // 委托方编号、委托方代码
   customerName: '', // 委托方名称
   startTime: '',
   endTime: '',
@@ -45,8 +49,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
@@ -69,6 +73,7 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -137,6 +142,8 @@
 
 watch(() => props.visible, (newValue) => {
   if (newValue) {
+    console.log('pppp', props.customerNo)
+
     fetchData(true)
   }
 })
@@ -150,7 +157,7 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <search-item>
+        <!-- <search-item>
           <el-input
             v-model.trim="listQuery.customerNo"
             placeholder="委托方编号"
@@ -165,7 +172,7 @@
             class="short-input"
             clearable
           />
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-input
             v-model.trim="listQuery.sampleNo"
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index fd6f673..1ec7f35 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -417,9 +417,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerId">
+            <el-form-item label="分包方编号:" prop="outsourcerNo">
               <el-input
-                v-model="detailForm.outsourcerId"
+                v-model="detailForm.outsourcerNo"
                 disabled
                 :placeholder="pageType === 'detail' ? '' : '请选择分包方编号'"
               >
@@ -456,7 +456,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计费用:" prop="preCost">
+            <el-form-item label="预计费用(元):" prop="preCost">
               <el-input
                 v-model="detailForm.preCost"
                 placeholder="请输入预计费用"

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 973afbf..137aa0f 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -24,6 +24,10 @@
     type: Boolean,
     default: false,
   },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -34,7 +38,7 @@
   orderCode: '',	// 原始记录单编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
-  customerNo: '', // 委托方id
+  customerNo: '', // 委托方编号、委托方代码
   customerName: '', // 委托方名称
   startTime: '',
   endTime: '',
@@ -45,8 +49,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
@@ -69,6 +73,7 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -137,6 +142,8 @@
 
 watch(() => props.visible, (newValue) => {
   if (newValue) {
+    console.log('pppp', props.customerNo)
+
     fetchData(true)
   }
 })
@@ -150,7 +157,7 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <search-item>
+        <!-- <search-item>
           <el-input
             v-model.trim="listQuery.customerNo"
             placeholder="委托方编号"
@@ -165,7 +172,7 @@
             class="short-input"
             clearable
           />
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-input
             v-model.trim="listQuery.sampleNo"
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index fd6f673..1ec7f35 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -417,9 +417,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerId">
+            <el-form-item label="分包方编号:" prop="outsourcerNo">
               <el-input
-                v-model="detailForm.outsourcerId"
+                v-model="detailForm.outsourcerNo"
                 disabled
                 :placeholder="pageType === 'detail' ? '' : '请选择分包方编号'"
               >
@@ -456,7 +456,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计费用:" prop="preCost">
+            <el-form-item label="预计费用(元):" prop="preCost">
               <el-input
                 v-model="detailForm.preCost"
                 placeholder="请输入预计费用"
diff --git a/src/views/business/subpackage/certificate/components/selectSample.vue b/src/views/business/subpackage/certificate/components/selectSample.vue
new file mode 100644
index 0000000..c738f9b
--- /dev/null
+++ b/src/views/business/subpackage/certificate/components/selectSample.vue
@@ -0,0 +1,299 @@
+<!-- 分包管理样品列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage, listPageBySubpackage } from '@/api/business/subpackage/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { IList } from '@/views/business/subpackage/apply/apply-interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+const sampleType = '1' // 默认分包项目
+const sampleTypeMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+const projectMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方编号、委托方代码
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
+  { text: '样品型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// ---------------------------------------分包项目----------------------------------------
+const projectList = ref<IList[]>([]) // 分包已通过项目列表
+const projectListOptions = ref<IList[]>([]) // 申请人列表（用户）--模糊搜索数据
+const projectLoading = ref(false) // 申请人模糊搜索框loading
+const selectProject = ref('') // 选择的项目
+// 获取项目列表
+async function fetchProjectList() {
+  const params = {
+    applicantEndTime: '', // 开始时间
+    applicantName: '', // 申请人名称
+    applicantStartTime: '', // 结束时间
+    approvalStatus: '4', // 申请状态 4已通过
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id
+    outsourcerName: '', // 	分包方名称
+    projectName: '', // 分包项目名称
+    projectNo: '', // 分包项目编号
+    offset: 1,
+    limit: 99999999,
+  }
+  // 模拟数据
+  const response = await getListPage(params)
+  projectList.value = response.data.rows
+  projectListOptions.value = response.data.rows
+  selectProject.value = response.data.rows[0].id
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    projectLoading.value = true
+    setTimeout(() => {
+      projectLoading.value = false
+      projectListOptions.value = projectList.value.filter((item) => {
+        return item.projectName.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    projectListOptions.value = projectList.value
+  }
+}
+// --------------------------------------------------------------------------------------
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    console.log('pppp', props.customerNo)
+    fetchProjectList().then(() => {
+      fetchData(true)
+    })
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        style="padding-left: 0;padding-right: 0;"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="sampleType" class="short-input" placeholder="请选择">
+            <el-option
+              v-for="item in sampleTypeMap"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="selectProject"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="projectLoading"
+          >
+            <el-option v-for="item in projectListOptions" :key="item.id" :label="item.projectName" :value="item.id" />
+            <!-- <el-option v-for="item in projectListOptions" :key="item.id" :label="`${item.projectName}(${item.projectNo})`" :value="item.id" /> -->
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 973afbf..137aa0f 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -24,6 +24,10 @@
     type: Boolean,
     default: false,
   },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -34,7 +38,7 @@
   orderCode: '',	// 原始记录单编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
-  customerNo: '', // 委托方id
+  customerNo: '', // 委托方编号、委托方代码
   customerName: '', // 委托方名称
   startTime: '',
   endTime: '',
@@ -45,8 +49,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
@@ -69,6 +73,7 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -137,6 +142,8 @@
 
 watch(() => props.visible, (newValue) => {
   if (newValue) {
+    console.log('pppp', props.customerNo)
+
     fetchData(true)
   }
 })
@@ -150,7 +157,7 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <search-item>
+        <!-- <search-item>
           <el-input
             v-model.trim="listQuery.customerNo"
             placeholder="委托方编号"
@@ -165,7 +172,7 @@
             class="short-input"
             clearable
           />
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-input
             v-model.trim="listQuery.sampleNo"
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index fd6f673..1ec7f35 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -417,9 +417,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerId">
+            <el-form-item label="分包方编号:" prop="outsourcerNo">
               <el-input
-                v-model="detailForm.outsourcerId"
+                v-model="detailForm.outsourcerNo"
                 disabled
                 :placeholder="pageType === 'detail' ? '' : '请选择分包方编号'"
               >
@@ -456,7 +456,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计费用:" prop="preCost">
+            <el-form-item label="预计费用(元):" prop="preCost">
               <el-input
                 v-model="detailForm.preCost"
                 placeholder="请输入预计费用"
diff --git a/src/views/business/subpackage/certificate/components/selectSample.vue b/src/views/business/subpackage/certificate/components/selectSample.vue
new file mode 100644
index 0000000..c738f9b
--- /dev/null
+++ b/src/views/business/subpackage/certificate/components/selectSample.vue
@@ -0,0 +1,299 @@
+<!-- 分包管理样品列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage, listPageBySubpackage } from '@/api/business/subpackage/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { IList } from '@/views/business/subpackage/apply/apply-interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+const sampleType = '1' // 默认分包项目
+const sampleTypeMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+const projectMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方编号、委托方代码
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
+  { text: '样品型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// ---------------------------------------分包项目----------------------------------------
+const projectList = ref<IList[]>([]) // 分包已通过项目列表
+const projectListOptions = ref<IList[]>([]) // 申请人列表（用户）--模糊搜索数据
+const projectLoading = ref(false) // 申请人模糊搜索框loading
+const selectProject = ref('') // 选择的项目
+// 获取项目列表
+async function fetchProjectList() {
+  const params = {
+    applicantEndTime: '', // 开始时间
+    applicantName: '', // 申请人名称
+    applicantStartTime: '', // 结束时间
+    approvalStatus: '4', // 申请状态 4已通过
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id
+    outsourcerName: '', // 	分包方名称
+    projectName: '', // 分包项目名称
+    projectNo: '', // 分包项目编号
+    offset: 1,
+    limit: 99999999,
+  }
+  // 模拟数据
+  const response = await getListPage(params)
+  projectList.value = response.data.rows
+  projectListOptions.value = response.data.rows
+  selectProject.value = response.data.rows[0].id
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    projectLoading.value = true
+    setTimeout(() => {
+      projectLoading.value = false
+      projectListOptions.value = projectList.value.filter((item) => {
+        return item.projectName.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    projectListOptions.value = projectList.value
+  }
+}
+// --------------------------------------------------------------------------------------
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    console.log('pppp', props.customerNo)
+    fetchProjectList().then(() => {
+      fetchData(true)
+    })
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        style="padding-left: 0;padding-right: 0;"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="sampleType" class="short-input" placeholder="请选择">
+            <el-option
+              v-for="item in sampleTypeMap"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="selectProject"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="projectLoading"
+          >
+            <el-option v-for="item in projectListOptions" :key="item.id" :label="item.projectName" :value="item.id" />
+            <!-- <el-option v-for="item in projectListOptions" :key="item.id" :label="`${item.projectName}(${item.projectNo})`" :value="item.id" /> -->
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 978e2a0..a9329e0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,17 +1,17 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import type { IForm } from './certificate-interface'
+import selectSample from './components/selectSample.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { UploadFile } from '@/api/measure/file'
-import selectSample from '@/views/business/subpackage/apply/components/selectSample.vue'
 import selectProjectApprove from '@/views/business/subpackage/apply/components/selectProjectApprove.vue'
-
+import { addCertificateList, updateCertificateList } from '@/api/business/subpackage/certificate'
 // 初始化router
 const $router = useRouter()
 const $route = useRoute()
@@ -67,7 +67,6 @@
     infoId.value = $route.params.id as string
   }
 }
-console.log(';;;;;;;;;;;;;;', $route.params)
 
 // ------------------------------------------选择样品---------------------------------------
 // 点击选择样品
@@ -100,11 +99,85 @@
   dataForm.value.outsourcerId = val[0].id // 分包方id
   dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+  console.log(dataForm.value.outsourcerNo)
 }
 // ---------------------------------------------------------------------------------------
+// ---------------------------------文件上传-------------------------------------------
+const fileRef = ref()
+const fileRefCertificate = ref()
+const onFileChangeCertificateFile = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const uploadCertificate = () => {
+  fileRefCertificate.value.click()
+}
+
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.originalRecordFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// -----------------------------------------------------------------------------------
+
 // 点击保存
 const saveForm = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (pageType.value === 'add') {
+    addCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else if (pageType.value === 'edit') {
+    updateCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
 }
 </script>
 
@@ -211,7 +284,7 @@
                 <el-form-item label="样品名称:" prop="sampleName">
                   <el-input
                     v-model="dataForm.sampleName"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品名称"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -221,7 +294,7 @@
                 <el-form-item label="样品型号:" prop="sampleModel">
                   <el-input
                     v-model="dataForm.sampleModel"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品型号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -231,7 +304,7 @@
                 <el-form-item label="出厂编号:" prop="manufacturingNo">
                   <el-input
                     v-model="dataForm.manufacturingNo"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="出厂编号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -255,8 +328,8 @@
                 <el-form-item label="证书报告附件:">
                   <show-photo v-if="dataForm.certificateFile" :minio-file-name="dataForm.certificateFile" />
                   <span v-else-if="pageType === 'detail'">无</span>
-                  <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="upload">
+                  <input v-show="pageType === ''" ref="fileRefCertificate" type="file" @change="onFileChangeCertificateFile">
+                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="uploadCertificate">
                     {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
@@ -271,7 +344,7 @@
         @change-visible="changeProjectVisible(false)"
       />
       <!-- 样品增加弹窗 -->
-      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+      <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.outsourcerNo" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 973afbf..137aa0f 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -24,6 +24,10 @@
     type: Boolean,
     default: false,
   },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -34,7 +38,7 @@
   orderCode: '',	// 原始记录单编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
-  customerNo: '', // 委托方id
+  customerNo: '', // 委托方编号、委托方代码
   customerName: '', // 委托方名称
   startTime: '',
   endTime: '',
@@ -45,8 +49,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
@@ -69,6 +73,7 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -137,6 +142,8 @@
 
 watch(() => props.visible, (newValue) => {
   if (newValue) {
+    console.log('pppp', props.customerNo)
+
     fetchData(true)
   }
 })
@@ -150,7 +157,7 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <search-item>
+        <!-- <search-item>
           <el-input
             v-model.trim="listQuery.customerNo"
             placeholder="委托方编号"
@@ -165,7 +172,7 @@
             class="short-input"
             clearable
           />
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-input
             v-model.trim="listQuery.sampleNo"
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index fd6f673..1ec7f35 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -417,9 +417,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerId">
+            <el-form-item label="分包方编号:" prop="outsourcerNo">
               <el-input
-                v-model="detailForm.outsourcerId"
+                v-model="detailForm.outsourcerNo"
                 disabled
                 :placeholder="pageType === 'detail' ? '' : '请选择分包方编号'"
               >
@@ -456,7 +456,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计费用:" prop="preCost">
+            <el-form-item label="预计费用(元):" prop="preCost">
               <el-input
                 v-model="detailForm.preCost"
                 placeholder="请输入预计费用"
diff --git a/src/views/business/subpackage/certificate/components/selectSample.vue b/src/views/business/subpackage/certificate/components/selectSample.vue
new file mode 100644
index 0000000..c738f9b
--- /dev/null
+++ b/src/views/business/subpackage/certificate/components/selectSample.vue
@@ -0,0 +1,299 @@
+<!-- 分包管理样品列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage, listPageBySubpackage } from '@/api/business/subpackage/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { IList } from '@/views/business/subpackage/apply/apply-interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+const sampleType = '1' // 默认分包项目
+const sampleTypeMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+const projectMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方编号、委托方代码
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
+  { text: '样品型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// ---------------------------------------分包项目----------------------------------------
+const projectList = ref<IList[]>([]) // 分包已通过项目列表
+const projectListOptions = ref<IList[]>([]) // 申请人列表（用户）--模糊搜索数据
+const projectLoading = ref(false) // 申请人模糊搜索框loading
+const selectProject = ref('') // 选择的项目
+// 获取项目列表
+async function fetchProjectList() {
+  const params = {
+    applicantEndTime: '', // 开始时间
+    applicantName: '', // 申请人名称
+    applicantStartTime: '', // 结束时间
+    approvalStatus: '4', // 申请状态 4已通过
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id
+    outsourcerName: '', // 	分包方名称
+    projectName: '', // 分包项目名称
+    projectNo: '', // 分包项目编号
+    offset: 1,
+    limit: 99999999,
+  }
+  // 模拟数据
+  const response = await getListPage(params)
+  projectList.value = response.data.rows
+  projectListOptions.value = response.data.rows
+  selectProject.value = response.data.rows[0].id
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    projectLoading.value = true
+    setTimeout(() => {
+      projectLoading.value = false
+      projectListOptions.value = projectList.value.filter((item) => {
+        return item.projectName.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    projectListOptions.value = projectList.value
+  }
+}
+// --------------------------------------------------------------------------------------
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    console.log('pppp', props.customerNo)
+    fetchProjectList().then(() => {
+      fetchData(true)
+    })
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        style="padding-left: 0;padding-right: 0;"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="sampleType" class="short-input" placeholder="请选择">
+            <el-option
+              v-for="item in sampleTypeMap"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="selectProject"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="projectLoading"
+          >
+            <el-option v-for="item in projectListOptions" :key="item.id" :label="item.projectName" :value="item.id" />
+            <!-- <el-option v-for="item in projectListOptions" :key="item.id" :label="`${item.projectName}(${item.projectNo})`" :value="item.id" /> -->
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 978e2a0..a9329e0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,17 +1,17 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import type { IForm } from './certificate-interface'
+import selectSample from './components/selectSample.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { UploadFile } from '@/api/measure/file'
-import selectSample from '@/views/business/subpackage/apply/components/selectSample.vue'
 import selectProjectApprove from '@/views/business/subpackage/apply/components/selectProjectApprove.vue'
-
+import { addCertificateList, updateCertificateList } from '@/api/business/subpackage/certificate'
 // 初始化router
 const $router = useRouter()
 const $route = useRoute()
@@ -67,7 +67,6 @@
     infoId.value = $route.params.id as string
   }
 }
-console.log(';;;;;;;;;;;;;;', $route.params)
 
 // ------------------------------------------选择样品---------------------------------------
 // 点击选择样品
@@ -100,11 +99,85 @@
   dataForm.value.outsourcerId = val[0].id // 分包方id
   dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+  console.log(dataForm.value.outsourcerNo)
 }
 // ---------------------------------------------------------------------------------------
+// ---------------------------------文件上传-------------------------------------------
+const fileRef = ref()
+const fileRefCertificate = ref()
+const onFileChangeCertificateFile = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const uploadCertificate = () => {
+  fileRefCertificate.value.click()
+}
+
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.originalRecordFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// -----------------------------------------------------------------------------------
+
 // 点击保存
 const saveForm = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (pageType.value === 'add') {
+    addCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else if (pageType.value === 'edit') {
+    updateCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
 }
 </script>
 
@@ -211,7 +284,7 @@
                 <el-form-item label="样品名称:" prop="sampleName">
                   <el-input
                     v-model="dataForm.sampleName"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品名称"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -221,7 +294,7 @@
                 <el-form-item label="样品型号:" prop="sampleModel">
                   <el-input
                     v-model="dataForm.sampleModel"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品型号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -231,7 +304,7 @@
                 <el-form-item label="出厂编号:" prop="manufacturingNo">
                   <el-input
                     v-model="dataForm.manufacturingNo"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="出厂编号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -255,8 +328,8 @@
                 <el-form-item label="证书报告附件:">
                   <show-photo v-if="dataForm.certificateFile" :minio-file-name="dataForm.certificateFile" />
                   <span v-else-if="pageType === 'detail'">无</span>
-                  <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="upload">
+                  <input v-show="pageType === ''" ref="fileRefCertificate" type="file" @change="onFileChangeCertificateFile">
+                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="uploadCertificate">
                     {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
@@ -271,7 +344,7 @@
         @change-visible="changeProjectVisible(false)"
       />
       <!-- 样品增加弹窗 -->
-      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+      <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.outsourcerNo" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 20cc2a1..e2f3287 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -289,8 +289,8 @@
       <el-form ref="ruleFormRef" :model="detailForm" label-width="140" label-position="right" :rules="formRules">
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="id">
-              <el-input v-model="detailForm.id" :placeholder="pageType === 'detail' ? '' : '请选择分包项目编号'" disabled>
+            <el-form-item label="分包项目编号:" prop="projectNo">
+              <el-input v-model="detailForm.projectNo" :placeholder="pageType === 'detail' ? '' : '请选择分包项目编号'" disabled>
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 973afbf..137aa0f 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -24,6 +24,10 @@
     type: Boolean,
     default: false,
   },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -34,7 +38,7 @@
   orderCode: '',	// 原始记录单编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
-  customerNo: '', // 委托方id
+  customerNo: '', // 委托方编号、委托方代码
   customerName: '', // 委托方名称
   startTime: '',
   endTime: '',
@@ -45,8 +49,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
@@ -69,6 +73,7 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -137,6 +142,8 @@
 
 watch(() => props.visible, (newValue) => {
   if (newValue) {
+    console.log('pppp', props.customerNo)
+
     fetchData(true)
   }
 })
@@ -150,7 +157,7 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <search-item>
+        <!-- <search-item>
           <el-input
             v-model.trim="listQuery.customerNo"
             placeholder="委托方编号"
@@ -165,7 +172,7 @@
             class="short-input"
             clearable
           />
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-input
             v-model.trim="listQuery.sampleNo"
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index fd6f673..1ec7f35 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -417,9 +417,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerId">
+            <el-form-item label="分包方编号:" prop="outsourcerNo">
               <el-input
-                v-model="detailForm.outsourcerId"
+                v-model="detailForm.outsourcerNo"
                 disabled
                 :placeholder="pageType === 'detail' ? '' : '请选择分包方编号'"
               >
@@ -456,7 +456,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计费用:" prop="preCost">
+            <el-form-item label="预计费用(元):" prop="preCost">
               <el-input
                 v-model="detailForm.preCost"
                 placeholder="请输入预计费用"
diff --git a/src/views/business/subpackage/certificate/components/selectSample.vue b/src/views/business/subpackage/certificate/components/selectSample.vue
new file mode 100644
index 0000000..c738f9b
--- /dev/null
+++ b/src/views/business/subpackage/certificate/components/selectSample.vue
@@ -0,0 +1,299 @@
+<!-- 分包管理样品列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage, listPageBySubpackage } from '@/api/business/subpackage/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { IList } from '@/views/business/subpackage/apply/apply-interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+const sampleType = '1' // 默认分包项目
+const sampleTypeMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+const projectMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方编号、委托方代码
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
+  { text: '样品型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// ---------------------------------------分包项目----------------------------------------
+const projectList = ref<IList[]>([]) // 分包已通过项目列表
+const projectListOptions = ref<IList[]>([]) // 申请人列表（用户）--模糊搜索数据
+const projectLoading = ref(false) // 申请人模糊搜索框loading
+const selectProject = ref('') // 选择的项目
+// 获取项目列表
+async function fetchProjectList() {
+  const params = {
+    applicantEndTime: '', // 开始时间
+    applicantName: '', // 申请人名称
+    applicantStartTime: '', // 结束时间
+    approvalStatus: '4', // 申请状态 4已通过
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id
+    outsourcerName: '', // 	分包方名称
+    projectName: '', // 分包项目名称
+    projectNo: '', // 分包项目编号
+    offset: 1,
+    limit: 99999999,
+  }
+  // 模拟数据
+  const response = await getListPage(params)
+  projectList.value = response.data.rows
+  projectListOptions.value = response.data.rows
+  selectProject.value = response.data.rows[0].id
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    projectLoading.value = true
+    setTimeout(() => {
+      projectLoading.value = false
+      projectListOptions.value = projectList.value.filter((item) => {
+        return item.projectName.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    projectListOptions.value = projectList.value
+  }
+}
+// --------------------------------------------------------------------------------------
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    console.log('pppp', props.customerNo)
+    fetchProjectList().then(() => {
+      fetchData(true)
+    })
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        style="padding-left: 0;padding-right: 0;"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="sampleType" class="short-input" placeholder="请选择">
+            <el-option
+              v-for="item in sampleTypeMap"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="selectProject"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="projectLoading"
+          >
+            <el-option v-for="item in projectListOptions" :key="item.id" :label="item.projectName" :value="item.id" />
+            <!-- <el-option v-for="item in projectListOptions" :key="item.id" :label="`${item.projectName}(${item.projectNo})`" :value="item.id" /> -->
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 978e2a0..a9329e0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,17 +1,17 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import type { IForm } from './certificate-interface'
+import selectSample from './components/selectSample.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { UploadFile } from '@/api/measure/file'
-import selectSample from '@/views/business/subpackage/apply/components/selectSample.vue'
 import selectProjectApprove from '@/views/business/subpackage/apply/components/selectProjectApprove.vue'
-
+import { addCertificateList, updateCertificateList } from '@/api/business/subpackage/certificate'
 // 初始化router
 const $router = useRouter()
 const $route = useRoute()
@@ -67,7 +67,6 @@
     infoId.value = $route.params.id as string
   }
 }
-console.log(';;;;;;;;;;;;;;', $route.params)
 
 // ------------------------------------------选择样品---------------------------------------
 // 点击选择样品
@@ -100,11 +99,85 @@
   dataForm.value.outsourcerId = val[0].id // 分包方id
   dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+  console.log(dataForm.value.outsourcerNo)
 }
 // ---------------------------------------------------------------------------------------
+// ---------------------------------文件上传-------------------------------------------
+const fileRef = ref()
+const fileRefCertificate = ref()
+const onFileChangeCertificateFile = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const uploadCertificate = () => {
+  fileRefCertificate.value.click()
+}
+
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.originalRecordFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// -----------------------------------------------------------------------------------
+
 // 点击保存
 const saveForm = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (pageType.value === 'add') {
+    addCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else if (pageType.value === 'edit') {
+    updateCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
 }
 </script>
 
@@ -211,7 +284,7 @@
                 <el-form-item label="样品名称:" prop="sampleName">
                   <el-input
                     v-model="dataForm.sampleName"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品名称"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -221,7 +294,7 @@
                 <el-form-item label="样品型号:" prop="sampleModel">
                   <el-input
                     v-model="dataForm.sampleModel"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品型号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -231,7 +304,7 @@
                 <el-form-item label="出厂编号:" prop="manufacturingNo">
                   <el-input
                     v-model="dataForm.manufacturingNo"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="出厂编号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -255,8 +328,8 @@
                 <el-form-item label="证书报告附件:">
                   <show-photo v-if="dataForm.certificateFile" :minio-file-name="dataForm.certificateFile" />
                   <span v-else-if="pageType === 'detail'">无</span>
-                  <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="upload">
+                  <input v-show="pageType === ''" ref="fileRefCertificate" type="file" @change="onFileChangeCertificateFile">
+                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="uploadCertificate">
                     {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
@@ -271,7 +344,7 @@
         @change-visible="changeProjectVisible(false)"
       />
       <!-- 样品增加弹窗 -->
-      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+      <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.outsourcerNo" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 20cc2a1..e2f3287 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -289,8 +289,8 @@
       <el-form ref="ruleFormRef" :model="detailForm" label-width="140" label-position="right" :rules="formRules">
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="id">
-              <el-input v-model="detailForm.id" :placeholder="pageType === 'detail' ? '' : '请选择分包项目编号'" disabled>
+            <el-form-item label="分包项目编号:" prop="projectNo">
+              <el-input v-model="detailForm.projectNo" :placeholder="pageType === 'detail' ? '' : '请选择分包项目编号'" disabled>
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3df0f0..93f9f52 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -16,10 +16,15 @@
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { deleteListItem, getListPage, submit } from '@/api/business/subpackage/check'
 import { cancelApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
 const approvalDialog = ref() // 审批对话ref
 const $route = useRoute()
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 const TabActiveButton = 'SubpackageCheckActive'
 const loadingTable = ref(false)
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
@@ -35,6 +40,7 @@
   outsourcerName: '', // 	分包方名称
   projectName: '', // 分包项目名称
   projectNo: '', // 分包项目编号
+  createUserId: '', // 验收人id
   offset: 1,
   limit: 20,
 })
@@ -270,8 +276,33 @@
   reset()
 }
 
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
 onMounted(async () => {
   await getDict() // 获取字典值
+  fetchUserList() // 获取人员列表
   if (window.sessionStorage.getItem(TabActiveButton)) {
     active.value = window.sessionStorage.getItem(TabActiveButton)!
   }
@@ -293,7 +324,19 @@
           <el-input v-model.trim="listQuery.projectName" placeholder="分包项目名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable />
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="listQuery.createUserId"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="applyPersonLoading"
+          >
+            <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 973afbf..137aa0f 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -24,6 +24,10 @@
     type: Boolean,
     default: false,
   },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -34,7 +38,7 @@
   orderCode: '',	// 原始记录单编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
-  customerNo: '', // 委托方id
+  customerNo: '', // 委托方编号、委托方代码
   customerName: '', // 委托方名称
   startTime: '',
   endTime: '',
@@ -45,8 +49,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
@@ -69,6 +73,7 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -137,6 +142,8 @@
 
 watch(() => props.visible, (newValue) => {
   if (newValue) {
+    console.log('pppp', props.customerNo)
+
     fetchData(true)
   }
 })
@@ -150,7 +157,7 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <search-item>
+        <!-- <search-item>
           <el-input
             v-model.trim="listQuery.customerNo"
             placeholder="委托方编号"
@@ -165,7 +172,7 @@
             class="short-input"
             clearable
           />
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-input
             v-model.trim="listQuery.sampleNo"
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index fd6f673..1ec7f35 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -417,9 +417,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerId">
+            <el-form-item label="分包方编号:" prop="outsourcerNo">
               <el-input
-                v-model="detailForm.outsourcerId"
+                v-model="detailForm.outsourcerNo"
                 disabled
                 :placeholder="pageType === 'detail' ? '' : '请选择分包方编号'"
               >
@@ -456,7 +456,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计费用:" prop="preCost">
+            <el-form-item label="预计费用(元):" prop="preCost">
               <el-input
                 v-model="detailForm.preCost"
                 placeholder="请输入预计费用"
diff --git a/src/views/business/subpackage/certificate/components/selectSample.vue b/src/views/business/subpackage/certificate/components/selectSample.vue
new file mode 100644
index 0000000..c738f9b
--- /dev/null
+++ b/src/views/business/subpackage/certificate/components/selectSample.vue
@@ -0,0 +1,299 @@
+<!-- 分包管理样品列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage, listPageBySubpackage } from '@/api/business/subpackage/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { IList } from '@/views/business/subpackage/apply/apply-interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+const sampleType = '1' // 默认分包项目
+const sampleTypeMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+const projectMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方编号、委托方代码
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
+  { text: '样品型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// ---------------------------------------分包项目----------------------------------------
+const projectList = ref<IList[]>([]) // 分包已通过项目列表
+const projectListOptions = ref<IList[]>([]) // 申请人列表（用户）--模糊搜索数据
+const projectLoading = ref(false) // 申请人模糊搜索框loading
+const selectProject = ref('') // 选择的项目
+// 获取项目列表
+async function fetchProjectList() {
+  const params = {
+    applicantEndTime: '', // 开始时间
+    applicantName: '', // 申请人名称
+    applicantStartTime: '', // 结束时间
+    approvalStatus: '4', // 申请状态 4已通过
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id
+    outsourcerName: '', // 	分包方名称
+    projectName: '', // 分包项目名称
+    projectNo: '', // 分包项目编号
+    offset: 1,
+    limit: 99999999,
+  }
+  // 模拟数据
+  const response = await getListPage(params)
+  projectList.value = response.data.rows
+  projectListOptions.value = response.data.rows
+  selectProject.value = response.data.rows[0].id
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    projectLoading.value = true
+    setTimeout(() => {
+      projectLoading.value = false
+      projectListOptions.value = projectList.value.filter((item) => {
+        return item.projectName.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    projectListOptions.value = projectList.value
+  }
+}
+// --------------------------------------------------------------------------------------
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    console.log('pppp', props.customerNo)
+    fetchProjectList().then(() => {
+      fetchData(true)
+    })
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        style="padding-left: 0;padding-right: 0;"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="sampleType" class="short-input" placeholder="请选择">
+            <el-option
+              v-for="item in sampleTypeMap"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="selectProject"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="projectLoading"
+          >
+            <el-option v-for="item in projectListOptions" :key="item.id" :label="item.projectName" :value="item.id" />
+            <!-- <el-option v-for="item in projectListOptions" :key="item.id" :label="`${item.projectName}(${item.projectNo})`" :value="item.id" /> -->
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 978e2a0..a9329e0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,17 +1,17 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import type { IForm } from './certificate-interface'
+import selectSample from './components/selectSample.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { UploadFile } from '@/api/measure/file'
-import selectSample from '@/views/business/subpackage/apply/components/selectSample.vue'
 import selectProjectApprove from '@/views/business/subpackage/apply/components/selectProjectApprove.vue'
-
+import { addCertificateList, updateCertificateList } from '@/api/business/subpackage/certificate'
 // 初始化router
 const $router = useRouter()
 const $route = useRoute()
@@ -67,7 +67,6 @@
     infoId.value = $route.params.id as string
   }
 }
-console.log(';;;;;;;;;;;;;;', $route.params)
 
 // ------------------------------------------选择样品---------------------------------------
 // 点击选择样品
@@ -100,11 +99,85 @@
   dataForm.value.outsourcerId = val[0].id // 分包方id
   dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+  console.log(dataForm.value.outsourcerNo)
 }
 // ---------------------------------------------------------------------------------------
+// ---------------------------------文件上传-------------------------------------------
+const fileRef = ref()
+const fileRefCertificate = ref()
+const onFileChangeCertificateFile = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const uploadCertificate = () => {
+  fileRefCertificate.value.click()
+}
+
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.originalRecordFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// -----------------------------------------------------------------------------------
+
 // 点击保存
 const saveForm = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (pageType.value === 'add') {
+    addCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else if (pageType.value === 'edit') {
+    updateCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
 }
 </script>
 
@@ -211,7 +284,7 @@
                 <el-form-item label="样品名称:" prop="sampleName">
                   <el-input
                     v-model="dataForm.sampleName"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品名称"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -221,7 +294,7 @@
                 <el-form-item label="样品型号:" prop="sampleModel">
                   <el-input
                     v-model="dataForm.sampleModel"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品型号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -231,7 +304,7 @@
                 <el-form-item label="出厂编号:" prop="manufacturingNo">
                   <el-input
                     v-model="dataForm.manufacturingNo"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="出厂编号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -255,8 +328,8 @@
                 <el-form-item label="证书报告附件:">
                   <show-photo v-if="dataForm.certificateFile" :minio-file-name="dataForm.certificateFile" />
                   <span v-else-if="pageType === 'detail'">无</span>
-                  <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="upload">
+                  <input v-show="pageType === ''" ref="fileRefCertificate" type="file" @change="onFileChangeCertificateFile">
+                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="uploadCertificate">
                     {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
@@ -271,7 +344,7 @@
         @change-visible="changeProjectVisible(false)"
       />
       <!-- 样品增加弹窗 -->
-      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+      <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.outsourcerNo" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 20cc2a1..e2f3287 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -289,8 +289,8 @@
       <el-form ref="ruleFormRef" :model="detailForm" label-width="140" label-position="right" :rules="formRules">
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="id">
-              <el-input v-model="detailForm.id" :placeholder="pageType === 'detail' ? '' : '请选择分包项目编号'" disabled>
+            <el-form-item label="分包项目编号:" prop="projectNo">
+              <el-input v-model="detailForm.projectNo" :placeholder="pageType === 'detail' ? '' : '请选择分包项目编号'" disabled>
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3df0f0..93f9f52 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -16,10 +16,15 @@
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { deleteListItem, getListPage, submit } from '@/api/business/subpackage/check'
 import { cancelApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
 const approvalDialog = ref() // 审批对话ref
 const $route = useRoute()
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 const TabActiveButton = 'SubpackageCheckActive'
 const loadingTable = ref(false)
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
@@ -35,6 +40,7 @@
   outsourcerName: '', // 	分包方名称
   projectName: '', // 分包项目名称
   projectNo: '', // 分包项目编号
+  createUserId: '', // 验收人id
   offset: 1,
   limit: 20,
 })
@@ -270,8 +276,33 @@
   reset()
 }
 
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
 onMounted(async () => {
   await getDict() // 获取字典值
+  fetchUserList() // 获取人员列表
   if (window.sessionStorage.getItem(TabActiveButton)) {
     active.value = window.sessionStorage.getItem(TabActiveButton)!
   }
@@ -293,7 +324,19 @@
           <el-input v-model.trim="listQuery.projectName" placeholder="分包项目名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable />
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="listQuery.createUserId"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="applyPersonLoading"
+          >
+            <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts
index 3b3a504..4f35907 100644
--- a/src/views/business/subpackage/subpackage-interface.ts
+++ b/src/views/business/subpackage/subpackage-interface.ts
@@ -7,6 +7,7 @@
   applicantStartTime: string // 申请开始日期
   applicantEndTime: string // 申请结束日期
   approvalStatus: string // 	审批状态
+  createUserId?: string // 验收人id
   formId: string
   offset: number
   limit: number

diff --git a/src/api/business/fieldTest/apply.ts b/src/api/business/fieldTest/apply.ts
new file mode 100644
index 0000000..a4947d1
--- /dev/null
+++ b/src/api/business/fieldTest/apply.ts
@@ -0,0 +1,60 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/approve/approve-interface'
+
+// 列表查询
+export function getFieldTestApproveList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function submit(data: { formId: any; id: string; processId?: string }) {
+  return request({
+    url: '/business/siteExecutive/submit',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过-驳回编辑
+export function failUpdateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
new file mode 100644
index 0000000..2c10aab
--- /dev/null
+++ b/src/api/business/fieldTest/record.ts
@@ -0,0 +1,42 @@
+/**
+ * 现场检测审批
+ */
+import request from '../../index'
+import type { IListQuery } from '@/views/business/fieldTest/record/record-interface'
+
+// 列表查询
+export function getFieldTestRecordList(data: IListQuery) {
+  return request({
+    url: `/business/siteExecutive/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delFieldTestApproveList(data: any) {
+  return request({
+    url: '/business/siteExecutive/batchDelete',
+    method: 'post',
+    data,
+  })
+}
+
+// 新增
+export function addFieldTestApproveList(data: object) {
+  return request({
+    url: '/business/siteExecutive/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateFieldTestApprove(data: object) {
+  return request({
+    url: '/business/siteExecutive/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index a7e59fd..dba2e12 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -22,3 +22,22 @@
     data,
   })
 }
+
+// 新建
+export function addCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/add',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+// 编辑
+export function updateCertificateList(data: Object) {
+  return request({
+    url: '/business/outsourceCertificate/update',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 456fe93..5427add 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,18 +504,6 @@
           auth: '/subpackage/certificate',
         },
       },
-      // {
-      //   path: 'subpackage/certificate/detail/:id?',
-      //   name: 'subpackageCertificateDetail',
-      //   component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-      //   meta: {
-      //     title: '分包证书管理',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/subpackage/certificate',
-      //   },
-      // },
       {
         path: ':type/:id?',
         name: 'subpackageCertificateDetail',
@@ -543,7 +531,7 @@
     children: [
       {
         path: 'record',
-        name: 'Record',
+        name: 'FieldTestRecord',
         component: () => import('@/views/business/fieldTest/record/list.vue'),
         meta: {
           title: '现场检测记录',
@@ -552,8 +540,20 @@
         },
       },
       {
+        path: 'record/:type/:id?',
+        name: 'FieldTestRecordDetail',
+        component: () => import('@/views/business/fieldTest/record/edit.vue'),
+        meta: {
+          title: '现场检测记录详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/record',
+        },
+      },
+      {
         path: 'approve',
-        name: 'Approve',
+        name: 'FieldTestApprove',
         component: () => import('@/views/business/fieldTest/approve/list.vue'),
         meta: {
           title: '现场检测审批',
@@ -561,6 +561,18 @@
           auth: '/fieldTest/approve',
         },
       },
+      {
+        path: 'approve/:type/:id?',
+        name: 'FieldTestApproveDetail',
+        component: () => import('@/views/business/fieldTest/approve/edit.vue'),
+        meta: {
+          title: '现场检测审批详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/fieldTest/approve',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 49d2fec..4aa5ed1 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -26,4 +26,5 @@
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
   BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
+  BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批
 }
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
new file mode 100644
index 0000000..aad0410
--- /dev/null
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -0,0 +1,66 @@
+// 列表查询
+export interface IListQuery {
+  approvalStatus: string // 审批状态类型code
+  customerName: string // 委托方名称
+  directorName: string // 负责人
+  formId: string // 表单id
+  siteExecutiveNo: string // 现场检测编号
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  siteExecutiveNo: string // 现场检测编号
+  customerName: string // 委托方名称
+  director: string // 联系人
+  phone: string // 电话
+  fullAddress: string // 委托方地址
+  executiveItem: string // 现场测试、校准或检定项目
+  directorName: string // 负责人
+  applyTime: string // 申请时间
+  approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id-审批时使用
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+export interface IForm {
+  siteExecutiveNo: string // 现场检测编号
+  siteExecutiveName: string // 现场检测名字
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyTime: string // 申请时间
+  directorName: string // 负责人
+  taskSource: string // 任务来源-字典code
+  taskSourceName: string // 任务来源-字典value
+  orderCode: string // 委托书编号
+  orderId: string // 委托书id
+  customerId: string // 委托方id
+  customerNo: string // 委托方代码
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  preCost: string // 预计计量费用
+  preStartTime: string // 预计开始时间
+  preEndTime: string // 预计结束时间
+  executiveAddress: string // 检测地址
+  executiveEnvironment: string // 现场环境条件
+  executiveItem: string // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: string // 主要危害源及预防措施
+  meterStaffList: any // 现场测试、校准或检定人员
+  equipmentInfoList: any // 携带仪器设备
+  remark: string // 备注
+  processId: string // 流程实例id
+}
+
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
new file mode 100644
index 0000000..c9be5b6
--- /dev/null
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -0,0 +1,797 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestApproveDetail">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import selectStaffList from '../components/selectStaffList.vue'
+import type { IForm, dictType } from './approve-interface'
+import { fetchApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import useUserStore from '@/store/modules/user'
+import { getUserList } from '@/api/system/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { userType } from '@/views/system/user/user-interface'
+import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
+import { addFieldTestApproveList, failUpdateFieldTestApprove, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
+const user = useUserStore() // 用户信息
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+const approvalStatusName = ref('') // 审批状态名称
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const ruleFormRef = ref<FormInstance>() // 表单ref
+const form = ref<IForm>({
+  siteExecutiveNo: '', // 现场检测编号
+  siteExecutiveName: '', // 现场检测名字
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyTime: '', // 申请时间
+  directorName: '', // 负责人
+  taskSource: '', // 任务来源-字典code
+  taskSourceName: '', // 任务来源-字典value
+  orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  preCost: '', // 预计计量费用
+  preStartTime: '', // 预计开始时间
+  preEndTime: '', // 预计结束时间
+  executiveAddress: '', // 检测地址
+  executiveEnvironment: '', // 现场环境条件
+  executiveItem: '', // 现场测试、校准或检定项目
+  hazardSourceAndPreventionMethod: '', // 主要危害源及预防措施
+  meterStaffList: [] as any, // 现场测试、校准或检定人员
+  equipmentInfoList: [] as any, // 携带仪器设备
+  remark: '', // 备注
+  processId: '', // 流程实例id
+})
+// 校验规则
+const formRules = ref({
+  directorName: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
+  taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
+  preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }],
+  hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }],
+  executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }],
+  executiveItem: [{ required: true, message: '要求现场测试、校准或检定项目不能为空', trigger: ['blur', 'change'] }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: ['blur', 'change'] }],
+})
+// ---------------------------------------------负责人-----------------------------------
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+// ---------------------------------------------字典------------------------------------
+const taskSourceMap = ref<dictType[]>([]) // 任务来源
+function getDict() {
+  // 任务来源
+  getDictByCode('taskSource').then((response) => {
+    taskSourceMap.value = response.data
+  })
+}
+// -----------------------------------------------选择委托书-----------------------------
+const orderVisible = ref(false) // 控制委托书对话框显隐
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    form.value.orderCode = val[0].orderCode // 委托书编号
+    form.value.orderId = val[0].id // 委托书id
+    form.value.customerNo = val[0].customerNo // 委托方代码
+    form.value.customerId = val[0].customerId // 委托方id
+    form.value.customerName = val[0].customerName // 委托方名称
+    form.value.customerAddress = val[0].customerAddress // 委托方地址
+    form.value.deliverer = val[0].deliverer // 联系人
+    form.value.delivererTel = val[0].delivererTel // 委托方名称
+  }
+}
+// ----------------------------------------审批流程-------------------------------------
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// ---------------------------------------现场检测人员----------------------------------
+const checkoutMeterPersonList = ref([]) as any// 人员选中列表
+const isMultiMerterPerson = ref(false) // 计量人员是否多选
+// 人员信息表头
+const meterPersonColumns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', width: '220' },
+  { text: '人员编号', value: 'staffNo', width: '160' },
+  { text: '工作部门', value: 'deptId' },
+  { text: '计量专业', value: 'major' },
+  { text: '证书编号', value: 'verifierCertificateNo' },
+  { text: '证书有效期', value: 'certificateDate', width: '120' },
+])
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const merterPersonRef = ref()
+// 点击选择
+const handleClick = (index: number) => {
+  isMultiMerterPerson.value = false
+  listIndex.value = index // 选择的第几行
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  if (isMultiMerterPerson.value) { // 批量增加时push
+    val.forEach((item: any) => {
+    // 只添加列表里不存在的
+      const index = form.value.meterStaffList.findIndex((i: any) => item.staffNo === i.staffNo)
+      if (index === -1) {
+        form.value.meterStaffList.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = form.value.meterStaffList.findIndex((i: any) => val[0].staffNo === i.staffNo)
+    if (index !== -1) {
+      ElMessage.warning('此人员已添加过')
+      return
+    }
+    form.value.meterStaffList.splice(listIndex.value, 1, val[0])
+  }
+}
+// 增加行
+const addMeterPersonRow = () => {
+  const index = form.value.meterStaffList.findIndex((item: { name: string }) => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条人员信息')
+    return
+  }
+  form.value.meterStaffList.push(
+    {
+      name: '', // 姓名
+      staffNo: '', // 人员编号
+      deptId: '', // 工作部门
+      major: '', // 计量专业
+      verifierCertificateNo: '', // 证书编号
+      certificateDate: '', // 证书有效期
+    },
+  )
+}
+// 删除行
+const delMeterPersonRow = () => {
+  if (checkoutMeterPersonList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeterPersonList.value.forEach((item: any) => {
+      form.value.meterStaffList.forEach((element: any, index: number) => {
+        if (element.staffNo === item.staffNo) {
+          form.value.meterStaffList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleMeterPersonSelectionChange = (val: any) => {
+  checkoutMeterPersonList.value = val
+}
+// 点击批量增加
+const multiAddMeterPerson = () => {
+  isMultiMerterPerson.value = true
+  merterPersonRef.value.initDialog()
+}
+// --------------------------------------------携带仪器设备------------------------------------------
+const checkoutEquipmentList = ref([]) as any// 人员选中列表
+const dialogSelectDiviceVisible = ref(false) // 选择设备对话框显隐
+// 携带仪器设备表头
+const EquipmentColumns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', width: '220' },
+  { text: '设备编号', value: 'equipmentNo', width: '160' },
+  { text: '型号', value: 'modelNo' },
+  { text: '出厂编号', value: 'manufacturingNo' },
+  { text: '使用部门', value: 'useDeptName' },
+  { text: '有效日期', value: 'validDate', width: '120' },
+])
+// 记录点击的第几行
+const listEquipmentIndex = ref(0)
+// 点击选择
+const handleEquipmentClick = (index: number) => {
+  listEquipmentIndex.value = index // 选择的第几行
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+// 选完设备
+const confirmSelectEquipment = (val: any) => {
+  const index = form.value.equipmentInfoList.findIndex((i: any) => val[0].equipmentNo === i.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('此设备已添加过')
+    return
+  }
+  form.value.equipmentInfoList.splice(listEquipmentIndex.value, 1, val[0])
+}
+// 增加行
+const addEquipmentRow = () => {
+  const index = form.value.equipmentInfoList.findIndex((item: { equipmentNo: string }) => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  form.value.equipmentInfoList.push(
+    {
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureRange: '', // 测量范围
+      useDeptName: '', // 使用部门
+      usePersonName: '', // 使用人
+      managerStateName: '', // 管理状态
+      validDate: '', // 有效日期
+      equipmentId: '', // 设备ID
+    },
+  )
+}
+// 删除行
+const delEquipmentRow = () => {
+  if (checkoutEquipmentList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutEquipmentList.value.forEach((item: any) => {
+      form.value.equipmentInfoList.forEach((element: any, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          form.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+// 选中变化
+const handleEquipmentSelectionChange = (val: any) => {
+  checkoutEquipmentList.value = val
+}
+
+// 扫描识别
+const scan = () => {
+
+}
+
+// ---------------------------------------------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const save = () => {
+  if (!form.value.meterStaffList.length) {
+    ElMessage.warning('现场测试、校准或检定人员表格不能为空')
+    return false
+  }
+  if (!form.value.equipmentInfoList.length) {
+    ElMessage.warning('携带仪器设备表格不能为空')
+    return false
+  }
+  ruleFormRef.value!.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 保存之前清除空行、避免传给后端无用空对象
+      const index = form.value.meterStaffList.findIndex((item: any) => !item.staffNo)
+      if (index !== -1) {
+        form.value.meterStaffList.splice(index, 1)
+      }
+      const indexEquipment = form.value.equipmentInfoList.findIndex((item: any) => !item.equipmentNo)
+      if (index !== -1) {
+        form.value.equipmentInfoList.splice(indexEquipment, 1)
+      }
+      form.value.equipmentInfoList = form.value.equipmentInfoList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      form.value.meterStaffList = form.value.meterStaffList.map((item: { id: string }) => {
+        return {
+          id: item.id,
+        }
+      })
+      // 新建
+      if (pageType.value === 'add') {
+        addFieldTestApproveList(form.value).then((res) => {
+          submitId.value = res.data.data
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      // 保存
+      else if (pageType.value === 'edit') {
+        if (approvalStatusName.value === '未通过-驳回') {
+          failUpdateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else {
+          updateFieldTestApprove(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+onMounted(() => {
+  if (pageType.value !== 'detail') {
+    fetchUserList() // 获取用户列表
+    getDict()// 字典
+  }
+  if (pageType.value !== 'add') {
+    getApprovalRecord(form.value.processId)
+  }
+  form.value.siteExecutiveName = '现场检测审批单' // 现场检测审批名字
+  form.value.applyPerson = user.id// 申请人
+  form.value.applyPersonName = user.name // 申请人名字
+  form.value.applyTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测审批-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="200"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测名称:" prop="siteExecutiveName">
+              <el-input
+                v-model="form.siteExecutiveName"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场检测名称'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="form.applyPersonName" disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="form.applyTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负责人:" prop="directorName">
+              <el-select
+                v-model="form.directorName"
+                placeholder="请选择负责人"
+                class="full-width-input"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务来源:" prop="taskSource">
+              <el-select
+                v-model="form.taskSource"
+                :placeholder="pageType === 'detail' ? '' : '请选择任务来源'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
+              >
+                <el-option v-for="item of taskSourceMap" :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="orderCode">
+              <el-input
+                v-model="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickOrder">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方代码:" prop="customerNo">
+              <el-input
+                v-model="form.customerNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="预计计量费用(元):" prop="preCost">
+              <el-input
+                v-model="form.preCost"
+                placeholder="请输入预计计量费用"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计开始时间:" prop="preStartTime">
+              <el-date-picker
+                v-model="form.preStartTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计结束时间:" prop="preEndTime">
+              <el-date-picker
+                v-model="form.preEndTime"
+                type="datetime"
+                placeholder="请选择"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定地点:" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场环境条件:" prop="executiveEnvironment">
+              <el-input
+                v-model="form.executiveEnvironment"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场环境条件'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="主要危害源及预防措施:" prop="hazardSourceAndPreventionMethod">
+              <el-input
+                v-model="form.hazardSourceAndPreventionMethod"
+                :placeholder="pageType === 'detail' ? '' : '请输入主要危害源及预防措施'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="现场测试、校准或检定项目:" prop="executiveItem">
+              <el-input
+                v-model="form.executiveItem"
+                :placeholder="pageType === 'detail' ? '' : '请输入现场测试、校准或检定项目'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="现场测试、校准或检定人员">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="multiAddMeterPerson">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addMeterPersonRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delMeterPersonRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.meterStaffList"
+        border
+        style="width: 100%;"
+        @selection-change="handleMeterPersonSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in meterPersonColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="携带仪器设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="scan">
+          扫描识别
+        </el-button>
+        <el-button type="primary" @click="addEquipmentRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delEquipmentRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="form.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleEquipmentSelectionChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in EquipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          align="center"
+        >
+          <template v-if="item.text === '设备名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleEquipmentClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="isMultiMerterPerson" @add="confirmSelectPerson" />
+    <!-- 设备 -->
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="false"
+      @close-dialog="closeDialog"
+      @update-device-confirm="confirmSelectEquipment"
+    />
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index c2143a4..ff359d2 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,11 +1,379 @@
-<!-- 现场检测审批列表 -->
-<script lang="ts" setup name="FieldTestApproveList">
-// 逻辑代码
+<!-- 现场检测记录列表 -->
+<script lang="ts" setup name="FieldTestRecordList">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './approve-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { delFieldTestApproveList, getFieldTestApproveList, submit } from '@/api/business/fieldTest/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  approvalStatus: '', // 审批状态类型code
+  customerName: '', // 委托方名称
+  directorName: '', // 负责人
+  formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+  siteExecutiveNo: '', // 现场检测编号
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '现场检测编号', value: 'siteExecutiveNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '联系人', value: 'director', align: 'center' },
+  { text: '电话', value: 'phone', align: 'center' },
+  { text: '委托方地址', value: 'fullAddress', align: 'center' },
+  { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
+  { text: '负责人', value: 'directorName', align: 'center' },
+  { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestApproveList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 申请状态
+    customerName: '', // 委托方名称
+    directorName: '', // 负责人
+    formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, // 表单id
+    siteExecutiveNo: '', // 现场检测编号
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/approve/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submit({ id: row.id, formId: SCHEDULE.BUSINESS_FIELDTEST_APPROVE, processId: row.processId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  clearList()
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测审批</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
new file mode 100644
index 0000000..56b2777
--- /dev/null
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -0,0 +1,185 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="SelectStaffListDialog">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  isMultiMerterPerson: { // 是否多选
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  // { text: '学历', value: 'education', align: 'center' },
+  // { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  // { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  // { text: '计量专业', value: 'major', align: 'center' },
+  // { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  // { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  // { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <!-- <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item> -->
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMultiMerterPerson"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
new file mode 100644
index 0000000..438dbfa
--- /dev/null
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -0,0 +1,260 @@
+<!-- 现场检测审批详情 -->
+<script lang="ts" setup name="FieldTestRecordDetail">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IForm } from './record-interface'
+import useUserStore from '@/store/modules/user'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute() // 路由参数
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const form = ref<IForm>({
+  logNo: '', // 记录单编号
+  recorder: '', // 记录人
+  recorderName: '', // 记录人名称
+  recordTime: '', // 记录时间
+  siteExecutiveId: '', // 现场检测id
+  siteExecutiveNo: '', // 现场检测编号
+  customerName: '', // 委托方名称
+  customerAddress: '', // 委托方地址
+  phone: '', // 委托方电话
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  executiveAddress: '', // 现场工作地点
+  outputVoltage: '', // 输出电压
+  zeroGroundVoltage: '', // 零地电压
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  remark: '', // 备注
+})
+// 校验规则
+const formRules = ref({
+  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }],
+  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }],
+})
+// ----------------------------------路由参数--------------------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ------------------------------------选择现场检测-------------------------------------------------
+const choose = () => {
+
+}
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 保存
+const save = () => {
+
+}
+
+onMounted(() => {
+  form.value.recorder = user.id// 记录人
+  form.value.recorderName = user.name // 记录人名字
+  form.value.recordTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 申请时间
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`现场检测记录-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-width="120"
+        label-position="right"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="记录单编号:" prop="logNo">
+              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录人:" prop="recorderName">
+              <el-input
+                v-model="form.recorderName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录时间:" prop="recordTime">
+              <el-date-picker
+                v-model="form.recordTime"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="现场检测编号:" prop="siteExecutiveNo">
+              <el-input v-model="form.siteExecutiveNo" class="full-width-input" disabled placeholder="系统自动生成">
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="choose">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model="form.customerName"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="委托方电话" prop="phone">
+              <el-input
+                class="full-width-input"
+                v-model="form.phone"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="deliverer">
+              <el-input
+                v-model="form.deliverer"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="delivererTel">
+              <el-input
+                v-model="form.delivererTel"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="委托方地址:" prop="customerAddress">
+              <el-input
+                v-model="form.customerAddress"
+                class="full-width-input"
+                type="textarea"
+                autosize
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="现场工作地点" prop="executiveAddress">
+              <el-input
+                v-model="form.executiveAddress"
+                class="full-width-input"
+                placeholder="请输入现场工作地点"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供电电压" prop="outputVoltage">
+              <el-input
+                v-model="form.outputVoltage"
+                class="full-width-input"
+                placeholder="请输入供电电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零地电压" prop="zeroGroundVoltage">
+              <el-input
+                v-model="form.zeroGroundVoltage"
+                class="full-width-input"
+                placeholder="请输入零地电压"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input
+                v-model="form.temperature"
+                class="full-width-input"
+                placeholder="请输入温度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对湿度" prop="humidity">
+              <el-input
+                v-model="form.humidity"
+                class="full-width-input"
+                placeholder="请输入相对湿度"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="16">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                v-model="form.remark"
+                class="full-width-input"
+                autosize
+                type="textarea"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/fieldTest/record/list.vue b/src/views/business/fieldTest/record/list.vue
index 5826860..9905fd5 100644
--- a/src/views/business/fieldTest/record/list.vue
+++ b/src/views/business/fieldTest/record/list.vue
@@ -1,11 +1,320 @@
 <!-- 现场检测记录列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './record-interface'
+import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { getFieldTestRecordList } from '@/api/business/fieldTest/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval } from '@/api/approval'
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const TabActiveButton = 'FieldTestRecordList'
+const loadingTable = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  laboratoryName: '', // 实验室
+  logNo: '', // 记录编号
+  recorderName: '', // 记录人
+  limit: 20,
+  offset: 1,
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录编号', value: 'logNo', align: 'center', width: '160px' },
+  { text: '实验室', value: 'laboratoryId', align: 'center' },
+  { text: '记录人', value: 'recorderName', align: 'center' },
+  { text: '现场工作地点', value: 'executiveAddress', align: 'center' },
+  { text: '记录时间', value: 'recordTime', align: 'center' },
+])
+const list = ref<IList[]>([]) // 列表
+const total = ref(0) // 数据总条数
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getFieldTestRecordList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 清除条件
+const clearList = () => {
+  listQuery.value = {
+    laboratoryName: '', // 实验室
+    logNo: '', // 记录编号
+    recorderName: '', // 记录人
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    path: '/fieldTest/record/add',
+  })
+}
+
+// 打印
+const printList = () => {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  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: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '现场检测记录列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 导出
+// const exportAll = () => {
+//   const loading = ElLoading.service({
+//     lock: true,
+//     text: 'Loading',
+//     background: 'rgba(255, 255, 255, 0.8)',
+//   })
+//   // if (list.value.length > 0) {
+//   //   const params = {
+//   //     category: '', // 类别
+//   //     id: '', // 主键id
+//   //     managerState: '', // 管理状态
+//   //     preparationEndDate: '', // 结束时间
+//   //     preparationStartDate: '', // 开始时间
+//   //     standardLaboratory: '', // 标准所在部门
+//   //     standardName: '', // 标准名称
+//   //     standardNo: '', // 标准编号
+//   //     validEndTime: '', // 结束时间
+//   //     validStartTime: '', // 开始时间
+//   //     offset: 1, // 当前页
+//   //     limit: 20, // 每页多少条
+//   //     ids: checkoutList.value,
+//   //   }
+//   //   // 导出接口
+//   //   exportRemindList(params).then((res) => {
+//   //     const blob = new Blob([res.data])
+//   //     exportFile(blob, '到期提醒列表.xlsx')
+//   //   })
+//   }
+//   else {
+//     ElMessage.warning('无数据可导出数据')
+//   }
+//   // 关闭loading
+//   loading.close()
+// }
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        delFieldTestApproveList({ ids: [row.id] }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    // $router.push({
+    //   path: `subpackage/apply/${val}/${row.id}`,
+    //   query: {
+    //     formId: listQuery.value.formId,
+    //     approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+    //     applyProcessId: row.applyProcessId, // 流程实例
+    //   },
+    // })
+  }
+}
+onMounted(async () => {
+
+})
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
-    <app-container>现场检测记录</app-container>
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.siteExecutiveNo" placeholder="现场检测编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.customerName" placeholder="委托方名称" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" 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"
+        >
+          <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"
+              fixed="right"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+            >
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'detail')"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '同意')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '驳回')"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '拒绝')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="handleEdit(row, '取消')"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="handleEdit(row, '删除')"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </app-container>
   </div>
 </template>
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
new file mode 100644
index 0000000..46d3ed0
--- /dev/null
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -0,0 +1,40 @@
+// 列表查询
+export interface IListQuery {
+  laboratoryName: string// 实验室
+  logNo: string// 记录编号
+  recorderName: string// 记录人
+  limit: number
+  offset: number
+}
+
+// 表格数据
+export interface IList {
+  id: string // 主键
+  logNo: string// 记录编号
+  laboratoryId: string // 实验室
+  recorderName: string// 记录人
+  executiveAddress: string // 现场工作地点
+  recordTime: string // 记录时间
+}
+
+// 详情表单
+export interface IForm {
+  logNo: string // 记录单编号
+  recorder: string// 记录人
+  recorderName: string// 记录人名称
+  recordTime: string // 记录时间
+  siteExecutiveId: string // 现场检测id
+  siteExecutiveNo: string// 现场检测编号
+  customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
+  phone: string // 委托方电话
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  executiveAddress: string // 现场工作地点
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  temperature: string // 温度
+  humidity: string // 湿度
+  remark: string // 备注
+}
+
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 973afbf..137aa0f 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -24,6 +24,10 @@
     type: Boolean,
     default: false,
   },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -34,7 +38,7 @@
   orderCode: '',	// 原始记录单编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
-  customerNo: '', // 委托方id
+  customerNo: '', // 委托方编号、委托方代码
   customerName: '', // 委托方名称
   startTime: '',
   endTime: '',
@@ -45,8 +49,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
@@ -69,6 +73,7 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -137,6 +142,8 @@
 
 watch(() => props.visible, (newValue) => {
   if (newValue) {
+    console.log('pppp', props.customerNo)
+
     fetchData(true)
   }
 })
@@ -150,7 +157,7 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <search-item>
+        <!-- <search-item>
           <el-input
             v-model.trim="listQuery.customerNo"
             placeholder="委托方编号"
@@ -165,7 +172,7 @@
             class="short-input"
             clearable
           />
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-input
             v-model.trim="listQuery.sampleNo"
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index fd6f673..1ec7f35 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -417,9 +417,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerId">
+            <el-form-item label="分包方编号:" prop="outsourcerNo">
               <el-input
-                v-model="detailForm.outsourcerId"
+                v-model="detailForm.outsourcerNo"
                 disabled
                 :placeholder="pageType === 'detail' ? '' : '请选择分包方编号'"
               >
@@ -456,7 +456,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计费用:" prop="preCost">
+            <el-form-item label="预计费用(元):" prop="preCost">
               <el-input
                 v-model="detailForm.preCost"
                 placeholder="请输入预计费用"
diff --git a/src/views/business/subpackage/certificate/components/selectSample.vue b/src/views/business/subpackage/certificate/components/selectSample.vue
new file mode 100644
index 0000000..c738f9b
--- /dev/null
+++ b/src/views/business/subpackage/certificate/components/selectSample.vue
@@ -0,0 +1,299 @@
+<!-- 分包管理样品列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage, listPageBySubpackage } from '@/api/business/subpackage/apply'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { IList } from '@/views/business/subpackage/apply/apply-interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
+  customerNo: { // 分包方编号
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+const sampleType = '1' // 默认分包项目
+const sampleTypeMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+const projectMap = [
+  {
+    id: '1',
+    name: '分包项目',
+  },
+  {
+    id: '2',
+    name: '样品库',
+  },
+]
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方编号、委托方代码
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '分包方名称', value: 'customerName', align: 'center' },
+  { text: '样品型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listQuery.value.customerNo = props.customerNo
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// ---------------------------------------分包项目----------------------------------------
+const projectList = ref<IList[]>([]) // 分包已通过项目列表
+const projectListOptions = ref<IList[]>([]) // 申请人列表（用户）--模糊搜索数据
+const projectLoading = ref(false) // 申请人模糊搜索框loading
+const selectProject = ref('') // 选择的项目
+// 获取项目列表
+async function fetchProjectList() {
+  const params = {
+    applicantEndTime: '', // 开始时间
+    applicantName: '', // 申请人名称
+    applicantStartTime: '', // 结束时间
+    approvalStatus: '4', // 申请状态 4已通过
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id
+    outsourcerName: '', // 	分包方名称
+    projectName: '', // 分包项目名称
+    projectNo: '', // 分包项目编号
+    offset: 1,
+    limit: 99999999,
+  }
+  // 模拟数据
+  const response = await getListPage(params)
+  projectList.value = response.data.rows
+  projectListOptions.value = response.data.rows
+  selectProject.value = response.data.rows[0].id
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    projectLoading.value = true
+    setTimeout(() => {
+      projectLoading.value = false
+      projectListOptions.value = projectList.value.filter((item) => {
+        return item.projectName.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    projectListOptions.value = projectList.value
+  }
+}
+// --------------------------------------------------------------------------------------
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    console.log('pppp', props.customerNo)
+    fetchProjectList().then(() => {
+      fetchData(true)
+    })
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        style="padding-left: 0;padding-right: 0;"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="sampleType" class="short-input" placeholder="请选择">
+            <el-option
+              v-for="item in sampleTypeMap"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="selectProject"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="projectLoading"
+          >
+            <el-option v-for="item in projectListOptions" :key="item.id" :label="item.projectName" :value="item.id" />
+            <!-- <el-option v-for="item in projectListOptions" :key="item.id" :label="`${item.projectName}(${item.projectNo})`" :value="item.id" /> -->
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="isMulti"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 978e2a0..a9329e0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,17 +1,17 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import type { IForm } from './certificate-interface'
+import selectSample from './components/selectSample.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { UploadFile } from '@/api/measure/file'
-import selectSample from '@/views/business/subpackage/apply/components/selectSample.vue'
 import selectProjectApprove from '@/views/business/subpackage/apply/components/selectProjectApprove.vue'
-
+import { addCertificateList, updateCertificateList } from '@/api/business/subpackage/certificate'
 // 初始化router
 const $router = useRouter()
 const $route = useRoute()
@@ -67,7 +67,6 @@
     infoId.value = $route.params.id as string
   }
 }
-console.log(';;;;;;;;;;;;;;', $route.params)
 
 // ------------------------------------------选择样品---------------------------------------
 // 点击选择样品
@@ -100,11 +99,85 @@
   dataForm.value.outsourcerId = val[0].id // 分包方id
   dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+  console.log(dataForm.value.outsourcerNo)
 }
 // ---------------------------------------------------------------------------------------
+// ---------------------------------文件上传-------------------------------------------
+const fileRef = ref()
+const fileRefCertificate = ref()
+const onFileChangeCertificateFile = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const uploadCertificate = () => {
+  fileRefCertificate.value.click()
+}
+
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.originalRecordFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// -----------------------------------------------------------------------------------
+
 // 点击保存
 const saveForm = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (pageType.value === 'add') {
+    addCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else if (pageType.value === 'edit') {
+    updateCertificateList(dataForm.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('保存成功')
+        close()
+        loading.close()
+      }
+    }).catch(() => {
+      loading.close()
+    })
+  }
 }
 </script>
 
@@ -211,7 +284,7 @@
                 <el-form-item label="样品名称:" prop="sampleName">
                   <el-input
                     v-model="dataForm.sampleName"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品名称"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -221,7 +294,7 @@
                 <el-form-item label="样品型号:" prop="sampleModel">
                   <el-input
                     v-model="dataForm.sampleModel"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="样品型号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -231,7 +304,7 @@
                 <el-form-item label="出厂编号:" prop="manufacturingNo">
                   <el-input
                     v-model="dataForm.manufacturingNo"
-                    :placeholder="pageType === 'detail' ? '' : ''"
+                    placeholder="出厂编号"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -255,8 +328,8 @@
                 <el-form-item label="证书报告附件:">
                   <show-photo v-if="dataForm.certificateFile" :minio-file-name="dataForm.certificateFile" />
                   <span v-else-if="pageType === 'detail'">无</span>
-                  <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="upload">
+                  <input v-show="pageType === ''" ref="fileRefCertificate" type="file" @change="onFileChangeCertificateFile">
+                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateFile === '' ? '0px' : '20px' }" @click="uploadCertificate">
                     {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
@@ -271,7 +344,7 @@
         @change-visible="changeProjectVisible(false)"
       />
       <!-- 样品增加弹窗 -->
-      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+      <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.outsourcerNo" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 20cc2a1..e2f3287 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -289,8 +289,8 @@
       <el-form ref="ruleFormRef" :model="detailForm" label-width="140" label-position="right" :rules="formRules">
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="id">
-              <el-input v-model="detailForm.id" :placeholder="pageType === 'detail' ? '' : '请选择分包项目编号'" disabled>
+            <el-form-item label="分包项目编号:" prop="projectNo">
+              <el-input v-model="detailForm.projectNo" :placeholder="pageType === 'detail' ? '' : '请选择分包项目编号'" disabled>
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3df0f0..93f9f52 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -16,10 +16,15 @@
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { deleteListItem, getListPage, submit } from '@/api/business/subpackage/check'
 import { cancelApproval } from '@/api/approval'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
 const approvalDialog = ref() // 审批对话ref
 const $route = useRoute()
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 const TabActiveButton = 'SubpackageCheckActive'
 const loadingTable = ref(false)
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
@@ -35,6 +40,7 @@
   outsourcerName: '', // 	分包方名称
   projectName: '', // 分包项目名称
   projectNo: '', // 分包项目编号
+  createUserId: '', // 验收人id
   offset: 1,
   limit: 20,
 })
@@ -270,8 +276,33 @@
   reset()
 }
 
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
 onMounted(async () => {
   await getDict() // 获取字典值
+  fetchUserList() // 获取人员列表
   if (window.sessionStorage.getItem(TabActiveButton)) {
     active.value = window.sessionStorage.getItem(TabActiveButton)!
   }
@@ -293,7 +324,19 @@
           <el-input v-model.trim="listQuery.projectName" placeholder="分包项目名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable />
+          <!-- <el-input v-model.trim="listQuery.applicantName" placeholder="验收人" class="short-input" clearable /> -->
+          <el-select
+            v-model="listQuery.createUserId"
+            placeholder="请选择验收人"
+            class="short-input"
+            filterable
+            remote
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="applyPersonLoading"
+          >
+            <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts
index 3b3a504..4f35907 100644
--- a/src/views/business/subpackage/subpackage-interface.ts
+++ b/src/views/business/subpackage/subpackage-interface.ts
@@ -7,6 +7,7 @@
   applicantStartTime: string // 申请开始日期
   applicantEndTime: string // 申请结束日期
   approvalStatus: string // 	审批状态
+  createUserId?: string // 验收人id
   formId: string
   offset: number
   limit: number
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 5e11e43..4e8d460 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -36,7 +36,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '管理状态', value: 'managerStateName', align: 'center' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
@@ -101,8 +101,9 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
+      style="padding-left: 0;padding-right: 0;"
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
@@ -121,37 +122,37 @@
         />
       </search-item>
     </search-area>
-    <table-container>
-      <normal-table
-        ref="table"
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :is-multi="isMulti"
-        is-showmulti-select
-        :list-loading="loadingTable"
-        :page-sizes="[20]"
-        :height="240"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
+    <!-- <table-container> -->
+    <normal-table
+      ref="table"
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :is-multi="isMulti"
+      is-showmulti-select
+      :list-loading="loadingTable"
+      :page-sizes="[20]"
+      :height="240"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <!-- </table-container> -->
 
     <template #footer>
       <span class="dialog-footer">
-        <el-button @click="close">取消</el-button>
         <el-button type="primary" @click="confirm">
           确定
         </el-button>
+        <el-button @click="close">取消</el-button>
       </span>
     </template>
   </el-dialog>