diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
index d24220d..1305751 100644
--- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -34,13 +34,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
-  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
-  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -62,7 +62,12 @@
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
+      return {
+        ...item,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -135,7 +140,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
index d24220d..1305751 100644
--- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -34,13 +34,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
-  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
-  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -62,7 +62,12 @@
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
+      return {
+        ...item,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -135,7 +140,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
index 405bcdc..2caa2a2 100644
--- a/src/views/business/subpackage/apply/components/selectProjectNo.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -124,7 +124,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
         </search-item>

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
index d24220d..1305751 100644
--- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -34,13 +34,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
-  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
-  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -62,7 +62,12 @@
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
+      return {
+        ...item,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -135,7 +140,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
index 405bcdc..2caa2a2 100644
--- a/src/views/business/subpackage/apply/components/selectProjectNo.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -124,7 +124,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 671105f..fd6f673 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -248,7 +248,7 @@
   }
 }
 
-// 选择项目id
+// 选择分包方
 const clickConfirmProject = (val: any) => {
   detailForm.value.outsourcerId = val[0].id // 分包方id
   detailForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
index d24220d..1305751 100644
--- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -34,13 +34,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
-  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
-  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -62,7 +62,12 @@
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
+      return {
+        ...item,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -135,7 +140,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
index 405bcdc..2caa2a2 100644
--- a/src/views/business/subpackage/apply/components/selectProjectNo.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -124,7 +124,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 671105f..fd6f673 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -248,7 +248,7 @@
   }
 }
 
-// 选择项目id
+// 选择分包方
 const clickConfirmProject = (val: any) => {
   detailForm.value.outsourcerId = val[0].id // 分包方id
   detailForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
diff --git a/src/views/business/subpackage/certificate/certificate-interface.ts b/src/views/business/subpackage/certificate/certificate-interface.ts
new file mode 100644
index 0000000..6b96a33
--- /dev/null
+++ b/src/views/business/subpackage/certificate/certificate-interface.ts
@@ -0,0 +1,44 @@
+// 查询条件
+export interface IListQuery {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerId: string // 检测单位,分包方id
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
+
+// 表格数据
+export interface IList {
+  id: string
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerName: string // 检测单位名称
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  createTime: string // 创建时间
+}
+
+// 详情表单
+export interface IForm {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  expirationDate: string // 证书有效期
+  issuanceDate: string // 证书出具日期
+  certificateFile: string // 证书文件
+  originalRecordFile: string // 原始记录文件
+  orderId: string // 委托书id
+  outsourcerId: string // 分包方id
+  outsourcerNo: string // 分包方编号
+  outsourcerName: string // 检测单位名称-分包方名称
+  sampleId: string // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+}

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
index d24220d..1305751 100644
--- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -34,13 +34,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
-  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
-  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -62,7 +62,12 @@
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
+      return {
+        ...item,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -135,7 +140,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
index 405bcdc..2caa2a2 100644
--- a/src/views/business/subpackage/apply/components/selectProjectNo.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -124,7 +124,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 671105f..fd6f673 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -248,7 +248,7 @@
   }
 }
 
-// 选择项目id
+// 选择分包方
 const clickConfirmProject = (val: any) => {
   detailForm.value.outsourcerId = val[0].id // 分包方id
   detailForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
diff --git a/src/views/business/subpackage/certificate/certificate-interface.ts b/src/views/business/subpackage/certificate/certificate-interface.ts
new file mode 100644
index 0000000..6b96a33
--- /dev/null
+++ b/src/views/business/subpackage/certificate/certificate-interface.ts
@@ -0,0 +1,44 @@
+// 查询条件
+export interface IListQuery {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerId: string // 检测单位,分包方id
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
+
+// 表格数据
+export interface IList {
+  id: string
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerName: string // 检测单位名称
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  createTime: string // 创建时间
+}
+
+// 详情表单
+export interface IForm {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  expirationDate: string // 证书有效期
+  issuanceDate: string // 证书出具日期
+  certificateFile: string // 证书文件
+  originalRecordFile: string // 原始记录文件
+  orderId: string // 委托书id
+  outsourcerId: string // 分包方id
+  outsourcerNo: string // 分包方编号
+  outsourcerName: string // 检测单位名称-分包方名称
+  sampleId: string // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+}
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 7eedf38..978e2a0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,13 +1,277 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { 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 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'
+
+// 初始化router
+const $router = useRouter()
+const $route = useRoute()
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const projectVisible = ref(false) // 控制选择分包方对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const dataForm: Ref<IForm> = ref({
+  certificateCode: '', // 证书号
+  certificateName: '', // 证书名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 证书出具日期
+  certificateFile: '', // 证书文件
+  originalRecordFile: '', // 原始记录文件
+  orderId: '', // 委托书id
+  outsourcerId: '', // 分包方id
+  outsourcerName: '', // 检测单位名称-分包方名称
+  outsourcerNo: '', // 分包方编号
+  sampleId: '', // 样品id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
+})// 表单
+const ruleFormRef = ref<FormInstance>() // 表单ref
+// 校验规则
+const rules = ref({
+  // sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  // manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  certificateCode: [{ required: true, message: '要求证书编号不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '要求证书名称不能为空', trigger: 'blur' }],
+  expirationDate: [{ required: true, message: '要求证书有效期不能为空', trigger: 'blur, change' }],
+  issuanceDate: [{ required: true, message: '要求证书出具日期不能为空', trigger: 'blur, change' }],
+  outsourcerName: [{ required: true, message: '要求样检测单位名称不能为空', trigger: 'blur, change' }],
+  sampleNo: [{ required: true, message: '要求样品编号不能为空', trigger: 'blur, change' }],
+}) // 表单验证规则
+
+// 关闭
+const close = () => {
+  $router.back()
+}
+
+// -----------------------------------------路由参数--------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+console.log(';;;;;;;;;;;;;;', $route.params)
+
+// ------------------------------------------选择样品---------------------------------------
+// 点击选择样品
+const handleSelectSample = () => {
+  if (!dataForm.value.outsourcerId) {
+    ElMessage.warning('请先选择检测单位')
+    return
+  }
+  sampleVisible.value = true // 选择样品对话框显隐
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+
+}
+// -----------------------------------------选择分包方------------------------------------------
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+// 点击选择分包方
+const handleSelectOutsourcer = () => {
+  projectVisible.value = true // 选择分包方对话框显隐
+}
+// 选择分好包方
+const clickConfirmProject = (val: any) => {
+  dataForm.value.outsourcerId = val[0].id // 分包方id
+  dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
+  dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+}
+// ---------------------------------------------------------------------------------------
+// 点击保存
+const saveForm = () => {
+
+}
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
     <app-container>
-      555
+      <detail-page v-loading="loading" :title="`分包证书管理-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="证书编号:" prop="certificateCode">
+                  <el-input
+                    v-model="dataForm.certificateCode"
+                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="证书名称:" prop="certificateName">
+                  <el-input
+                    v-model.trim="dataForm.certificateName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col><el-col :span="6">
+                <el-form-item label="证书有效期 :" prop="expirationDate">
+                  <el-date-picker
+                    v-model="dataForm.expirationDate"
+                    type="date"
+                    style="width: 100%;"
+                    :placeholder="pageType === 'detail' ? '' : '请选择证书有效期'"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="证书出具日期  :" prop="issuanceDate">
+                  <el-date-picker
+                    v-model="dataForm.issuanceDate"
+                    type="date"
+                    style="width: 100%;"
+                    :placeholder="pageType === 'detail' ? '' : '请选择证书出具日期 '"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="检测单位:" prop="outsourcerName">
+                  <el-input
+                    v-model="dataForm.outsourcerName"
+                    :placeholder="pageType === 'detail' ? '' : '请选择检测单位'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template #append>
+                      <el-button size="small" @click="handleSelectOutsourcer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品编号:" prop="sampleNo">
+                  <el-input
+                    v-model="dataForm.sampleNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择样品'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template #append>
+                      <el-button size="small" @click="handleSelectSample">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品名称:" prop="sampleName">
+                  <el-input
+                    v-model="dataForm.sampleName"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品型号:" prop="sampleModel">
+                  <el-input
+                    v-model="dataForm.sampleModel"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="出厂编号:" prop="manufacturingNo">
+                  <el-input
+                    v-model="dataForm.manufacturingNo"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="14">
+                <el-form-item label="原始记录附件:">
+                  <show-photo v-if="dataForm.originalRecordFile" :minio-file-name="dataForm.originalRecordFile" />
+                  <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.originalRecordFile === '' ? '0px' : '20px' }" @click="upload">
+                    {{ dataForm.originalRecordFile === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="14">
+                <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">
+                    {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 项目选择 -->
+      <select-project-approve
+        v-model:visible="projectVisible" @clickConfirmProject="clickConfirmProject"
+        @change-visible="changeProjectVisible(false)"
+      />
+      <!-- 样品增加弹窗 -->
+      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
index d24220d..1305751 100644
--- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -34,13 +34,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
-  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
-  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -62,7 +62,12 @@
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
+      return {
+        ...item,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -135,7 +140,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
index 405bcdc..2caa2a2 100644
--- a/src/views/business/subpackage/apply/components/selectProjectNo.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -124,7 +124,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 671105f..fd6f673 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -248,7 +248,7 @@
   }
 }
 
-// 选择项目id
+// 选择分包方
 const clickConfirmProject = (val: any) => {
   detailForm.value.outsourcerId = val[0].id // 分包方id
   detailForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
diff --git a/src/views/business/subpackage/certificate/certificate-interface.ts b/src/views/business/subpackage/certificate/certificate-interface.ts
new file mode 100644
index 0000000..6b96a33
--- /dev/null
+++ b/src/views/business/subpackage/certificate/certificate-interface.ts
@@ -0,0 +1,44 @@
+// 查询条件
+export interface IListQuery {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerId: string // 检测单位,分包方id
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
+
+// 表格数据
+export interface IList {
+  id: string
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerName: string // 检测单位名称
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  createTime: string // 创建时间
+}
+
+// 详情表单
+export interface IForm {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  expirationDate: string // 证书有效期
+  issuanceDate: string // 证书出具日期
+  certificateFile: string // 证书文件
+  originalRecordFile: string // 原始记录文件
+  orderId: string // 委托书id
+  outsourcerId: string // 分包方id
+  outsourcerNo: string // 分包方编号
+  outsourcerName: string // 检测单位名称-分包方名称
+  sampleId: string // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+}
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 7eedf38..978e2a0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,13 +1,277 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { 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 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'
+
+// 初始化router
+const $router = useRouter()
+const $route = useRoute()
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const projectVisible = ref(false) // 控制选择分包方对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const dataForm: Ref<IForm> = ref({
+  certificateCode: '', // 证书号
+  certificateName: '', // 证书名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 证书出具日期
+  certificateFile: '', // 证书文件
+  originalRecordFile: '', // 原始记录文件
+  orderId: '', // 委托书id
+  outsourcerId: '', // 分包方id
+  outsourcerName: '', // 检测单位名称-分包方名称
+  outsourcerNo: '', // 分包方编号
+  sampleId: '', // 样品id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
+})// 表单
+const ruleFormRef = ref<FormInstance>() // 表单ref
+// 校验规则
+const rules = ref({
+  // sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  // manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  certificateCode: [{ required: true, message: '要求证书编号不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '要求证书名称不能为空', trigger: 'blur' }],
+  expirationDate: [{ required: true, message: '要求证书有效期不能为空', trigger: 'blur, change' }],
+  issuanceDate: [{ required: true, message: '要求证书出具日期不能为空', trigger: 'blur, change' }],
+  outsourcerName: [{ required: true, message: '要求样检测单位名称不能为空', trigger: 'blur, change' }],
+  sampleNo: [{ required: true, message: '要求样品编号不能为空', trigger: 'blur, change' }],
+}) // 表单验证规则
+
+// 关闭
+const close = () => {
+  $router.back()
+}
+
+// -----------------------------------------路由参数--------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+console.log(';;;;;;;;;;;;;;', $route.params)
+
+// ------------------------------------------选择样品---------------------------------------
+// 点击选择样品
+const handleSelectSample = () => {
+  if (!dataForm.value.outsourcerId) {
+    ElMessage.warning('请先选择检测单位')
+    return
+  }
+  sampleVisible.value = true // 选择样品对话框显隐
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+
+}
+// -----------------------------------------选择分包方------------------------------------------
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+// 点击选择分包方
+const handleSelectOutsourcer = () => {
+  projectVisible.value = true // 选择分包方对话框显隐
+}
+// 选择分好包方
+const clickConfirmProject = (val: any) => {
+  dataForm.value.outsourcerId = val[0].id // 分包方id
+  dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
+  dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+}
+// ---------------------------------------------------------------------------------------
+// 点击保存
+const saveForm = () => {
+
+}
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
     <app-container>
-      555
+      <detail-page v-loading="loading" :title="`分包证书管理-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="证书编号:" prop="certificateCode">
+                  <el-input
+                    v-model="dataForm.certificateCode"
+                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="证书名称:" prop="certificateName">
+                  <el-input
+                    v-model.trim="dataForm.certificateName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col><el-col :span="6">
+                <el-form-item label="证书有效期 :" prop="expirationDate">
+                  <el-date-picker
+                    v-model="dataForm.expirationDate"
+                    type="date"
+                    style="width: 100%;"
+                    :placeholder="pageType === 'detail' ? '' : '请选择证书有效期'"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="证书出具日期  :" prop="issuanceDate">
+                  <el-date-picker
+                    v-model="dataForm.issuanceDate"
+                    type="date"
+                    style="width: 100%;"
+                    :placeholder="pageType === 'detail' ? '' : '请选择证书出具日期 '"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="检测单位:" prop="outsourcerName">
+                  <el-input
+                    v-model="dataForm.outsourcerName"
+                    :placeholder="pageType === 'detail' ? '' : '请选择检测单位'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template #append>
+                      <el-button size="small" @click="handleSelectOutsourcer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品编号:" prop="sampleNo">
+                  <el-input
+                    v-model="dataForm.sampleNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择样品'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template #append>
+                      <el-button size="small" @click="handleSelectSample">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品名称:" prop="sampleName">
+                  <el-input
+                    v-model="dataForm.sampleName"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品型号:" prop="sampleModel">
+                  <el-input
+                    v-model="dataForm.sampleModel"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="出厂编号:" prop="manufacturingNo">
+                  <el-input
+                    v-model="dataForm.manufacturingNo"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="14">
+                <el-form-item label="原始记录附件:">
+                  <show-photo v-if="dataForm.originalRecordFile" :minio-file-name="dataForm.originalRecordFile" />
+                  <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.originalRecordFile === '' ? '0px' : '20px' }" @click="upload">
+                    {{ dataForm.originalRecordFile === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="14">
+                <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">
+                    {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 项目选择 -->
+      <select-project-approve
+        v-model:visible="projectVisible" @clickConfirmProject="clickConfirmProject"
+        @change-visible="changeProjectVisible(false)"
+      />
+      <!-- 样品增加弹窗 -->
+      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index ada0f7b..868f00d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -4,38 +4,57 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IListQueryRecord } from '../subpackage-interface'
+import type { IList, IListQuery } from './certificate-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
-const listQuery: Ref<IListQueryRecord> = ref({
-  businessSize: '', // 业务规模-字典code
-  formId: SCHEDULE.BUSINESS_SUBPACKAGE_MANAGE, // 表单id
-  grade: '', // 	履约评级-字典code
-  ids: [],
-  outsourcerName: '', // 分包方公司名字
-  outsourcerNo: '', // 编号
+const listQuery: Ref<IListQuery> = ref({
+  certificateCode: '', // 证书号
+  certificateName: '', // 证书名称
+  outsourcerId: '', // 检测单位,分包方id
+  printStatus: '', // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
+const printStatusList = [
+  {
+    name: '全部',
+    value: '',
+
+  },
+  {
+    name: '未打印',
+    value: '0',
+
+  },
+  {
+    name: '已打印',
+    value: '1',
+  },
+]
 const loadingTable = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '证书名称', value: 'customerNo', align: 'center', width: '160px' },
-  { text: '样品编号', value: 'customerName', align: 'center', width: '160px' },
-  { text: '样品名称', value: 'reciever', align: 'center', width: '180px' },
-  { text: '型号', value: 'deliverer', align: 'center', width: '180px' },
-  { text: '出厂编号', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '检测单位', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '打印状态', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '创建时间', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '证书编号', value: 'certificateCode', align: 'center', width: '160px' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160px' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '检测单位', value: 'outsourcerName', align: 'center' },
+  { text: '打印状态', value: 'printStatus', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
-const list = ref([])
-const total = ref(0)
+const list = ref<IList[]>([]) // 表格数据
+const total = ref(0) // 数据总数
+const checkoutList = ref<string[]>([]) // 选中的内容
 
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -46,17 +65,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  // getListPage(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   let interfaceStr = ''
-  //   for (const key in response.data.rows[0]) {
-  //     const item = response.data.rows[0][key]
-  //     interfaceStr += `${key}:${typeof (item)}\n`
-  //   }
-  //   console.log(interfaceStr)
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getcertificateList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -66,35 +79,100 @@
 // 清除条件
 const clearList = () => {
   listQuery.value = {
-    businessSize: '',
-    // evaluation: '',
-    formId: '',
-    grade: '',
-    outsourcerName: '',
-    outsourcerNo: '',
+    certificateCode: '', // 证书号
+    certificateName: '', // 证书名称
+    outsourcerId: '', // 检测单位,分包方id
+    printStatus: '', // 打印状态（1已打印、0未打印，不传为查询全部）
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
-  fetchData()
+  fetchData(true)
 }
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 exportAll = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      certificateCode: listQuery.value.certificateCode, // 证书号
+      certificateName: listQuery.value.certificateName, // 证书名称
+      outsourcerId: listQuery.value.outsourcerId, // 检测单位,分包方id
+      printStatus: listQuery.value.printStatus, // 打印状态（1已打印、0未打印，不传为查询全部）
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportcertificateList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '分包证书列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
 }
 // 打印
 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 = () => {
 
+// 点击编辑或详情
+const handleDetail = (row: IList, type: 'edit' | 'detail') => {
+  $router.push({
+    path: `/subpackage/certificate/${type}/${row.id}`,
+  })
 }
-// 选中
-const handleSelectionChange = () => {
 
+// 点击新建
+const add = (row: IList) => {
+  $router.push({
+    path: '/subpackage/add',
+  })
 }
-// 详情
-const handleDetail = (row) => {
+
+// 点击表格中的打印
+const print = (row: IList) => {
 
 }
 
@@ -109,28 +187,27 @@
     <app-container>
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
-          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="证书号" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.certificateCode" placeholder="证书号" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.outsourcerName" placeholder="证书名称" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessSize" placeholder="样品编号" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.sampleNo" placeholder="样品编号" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.grade" placeholder="样品名称" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.grade" placeholder="监测单位" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.outsourcerId" placeholder="检测单位" class="short-input" clearable />
         </search-item>
         <search-item>
           <el-select
-            v-model="listQuery.grade"
+            v-model="listQuery.printStatus"
             placeholder="打印状态"
             class="short-input"
           >
-            <el-option label="可打印" value="1" />
-            <el-option label="不可打印" value="2" />
+            <el-option v-for="(item, index) in printStatusList" :key="index" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
       </search-area>
@@ -138,7 +215,7 @@
         <template #btns-right>
           <icon-button icon="icon-import" title="批量导入" type="primary" />
           <icon-button icon="icon-template" title="模板下载" type="primary" />
-          <icon-button icon="icon-add" title="新建" type="primary" />
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
@@ -156,9 +233,15 @@
           <template #columns>
             <el-table-column label="操作" align="center" fixed="right" width="120">
               <template #default="{ row }">
-                <el-button size="small" link type="primary" @click="handleDetail(row)">
+                <el-button size="small" link type="primary" @click="handleDetail(row, 'edit')">
+                  编辑
+                </el-button>
+                <el-button size="small" link type="primary" @click="handleDetail(row, 'detail')">
                   详情
                 </el-button>
+                <el-button disabled size="small" link type="primary" @click="print(row)">
+                  打印
+                </el-button>
               </template>
             </el-table-column>
           </template>

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
index d24220d..1305751 100644
--- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -34,13 +34,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
-  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
-  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -62,7 +62,12 @@
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
+      return {
+        ...item,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -135,7 +140,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
index 405bcdc..2caa2a2 100644
--- a/src/views/business/subpackage/apply/components/selectProjectNo.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -124,7 +124,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 671105f..fd6f673 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -248,7 +248,7 @@
   }
 }
 
-// 选择项目id
+// 选择分包方
 const clickConfirmProject = (val: any) => {
   detailForm.value.outsourcerId = val[0].id // 分包方id
   detailForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
diff --git a/src/views/business/subpackage/certificate/certificate-interface.ts b/src/views/business/subpackage/certificate/certificate-interface.ts
new file mode 100644
index 0000000..6b96a33
--- /dev/null
+++ b/src/views/business/subpackage/certificate/certificate-interface.ts
@@ -0,0 +1,44 @@
+// 查询条件
+export interface IListQuery {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerId: string // 检测单位,分包方id
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
+
+// 表格数据
+export interface IList {
+  id: string
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerName: string // 检测单位名称
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  createTime: string // 创建时间
+}
+
+// 详情表单
+export interface IForm {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  expirationDate: string // 证书有效期
+  issuanceDate: string // 证书出具日期
+  certificateFile: string // 证书文件
+  originalRecordFile: string // 原始记录文件
+  orderId: string // 委托书id
+  outsourcerId: string // 分包方id
+  outsourcerNo: string // 分包方编号
+  outsourcerName: string // 检测单位名称-分包方名称
+  sampleId: string // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+}
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 7eedf38..978e2a0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,13 +1,277 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { 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 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'
+
+// 初始化router
+const $router = useRouter()
+const $route = useRoute()
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const projectVisible = ref(false) // 控制选择分包方对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const dataForm: Ref<IForm> = ref({
+  certificateCode: '', // 证书号
+  certificateName: '', // 证书名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 证书出具日期
+  certificateFile: '', // 证书文件
+  originalRecordFile: '', // 原始记录文件
+  orderId: '', // 委托书id
+  outsourcerId: '', // 分包方id
+  outsourcerName: '', // 检测单位名称-分包方名称
+  outsourcerNo: '', // 分包方编号
+  sampleId: '', // 样品id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
+})// 表单
+const ruleFormRef = ref<FormInstance>() // 表单ref
+// 校验规则
+const rules = ref({
+  // sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  // manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  certificateCode: [{ required: true, message: '要求证书编号不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '要求证书名称不能为空', trigger: 'blur' }],
+  expirationDate: [{ required: true, message: '要求证书有效期不能为空', trigger: 'blur, change' }],
+  issuanceDate: [{ required: true, message: '要求证书出具日期不能为空', trigger: 'blur, change' }],
+  outsourcerName: [{ required: true, message: '要求样检测单位名称不能为空', trigger: 'blur, change' }],
+  sampleNo: [{ required: true, message: '要求样品编号不能为空', trigger: 'blur, change' }],
+}) // 表单验证规则
+
+// 关闭
+const close = () => {
+  $router.back()
+}
+
+// -----------------------------------------路由参数--------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+console.log(';;;;;;;;;;;;;;', $route.params)
+
+// ------------------------------------------选择样品---------------------------------------
+// 点击选择样品
+const handleSelectSample = () => {
+  if (!dataForm.value.outsourcerId) {
+    ElMessage.warning('请先选择检测单位')
+    return
+  }
+  sampleVisible.value = true // 选择样品对话框显隐
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+
+}
+// -----------------------------------------选择分包方------------------------------------------
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+// 点击选择分包方
+const handleSelectOutsourcer = () => {
+  projectVisible.value = true // 选择分包方对话框显隐
+}
+// 选择分好包方
+const clickConfirmProject = (val: any) => {
+  dataForm.value.outsourcerId = val[0].id // 分包方id
+  dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
+  dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+}
+// ---------------------------------------------------------------------------------------
+// 点击保存
+const saveForm = () => {
+
+}
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
     <app-container>
-      555
+      <detail-page v-loading="loading" :title="`分包证书管理-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="证书编号:" prop="certificateCode">
+                  <el-input
+                    v-model="dataForm.certificateCode"
+                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="证书名称:" prop="certificateName">
+                  <el-input
+                    v-model.trim="dataForm.certificateName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col><el-col :span="6">
+                <el-form-item label="证书有效期 :" prop="expirationDate">
+                  <el-date-picker
+                    v-model="dataForm.expirationDate"
+                    type="date"
+                    style="width: 100%;"
+                    :placeholder="pageType === 'detail' ? '' : '请选择证书有效期'"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="证书出具日期  :" prop="issuanceDate">
+                  <el-date-picker
+                    v-model="dataForm.issuanceDate"
+                    type="date"
+                    style="width: 100%;"
+                    :placeholder="pageType === 'detail' ? '' : '请选择证书出具日期 '"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="检测单位:" prop="outsourcerName">
+                  <el-input
+                    v-model="dataForm.outsourcerName"
+                    :placeholder="pageType === 'detail' ? '' : '请选择检测单位'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template #append>
+                      <el-button size="small" @click="handleSelectOutsourcer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品编号:" prop="sampleNo">
+                  <el-input
+                    v-model="dataForm.sampleNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择样品'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template #append>
+                      <el-button size="small" @click="handleSelectSample">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品名称:" prop="sampleName">
+                  <el-input
+                    v-model="dataForm.sampleName"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品型号:" prop="sampleModel">
+                  <el-input
+                    v-model="dataForm.sampleModel"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="出厂编号:" prop="manufacturingNo">
+                  <el-input
+                    v-model="dataForm.manufacturingNo"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="14">
+                <el-form-item label="原始记录附件:">
+                  <show-photo v-if="dataForm.originalRecordFile" :minio-file-name="dataForm.originalRecordFile" />
+                  <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.originalRecordFile === '' ? '0px' : '20px' }" @click="upload">
+                    {{ dataForm.originalRecordFile === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="14">
+                <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">
+                    {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 项目选择 -->
+      <select-project-approve
+        v-model:visible="projectVisible" @clickConfirmProject="clickConfirmProject"
+        @change-visible="changeProjectVisible(false)"
+      />
+      <!-- 样品增加弹窗 -->
+      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index ada0f7b..868f00d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -4,38 +4,57 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IListQueryRecord } from '../subpackage-interface'
+import type { IList, IListQuery } from './certificate-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
-const listQuery: Ref<IListQueryRecord> = ref({
-  businessSize: '', // 业务规模-字典code
-  formId: SCHEDULE.BUSINESS_SUBPACKAGE_MANAGE, // 表单id
-  grade: '', // 	履约评级-字典code
-  ids: [],
-  outsourcerName: '', // 分包方公司名字
-  outsourcerNo: '', // 编号
+const listQuery: Ref<IListQuery> = ref({
+  certificateCode: '', // 证书号
+  certificateName: '', // 证书名称
+  outsourcerId: '', // 检测单位,分包方id
+  printStatus: '', // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
+const printStatusList = [
+  {
+    name: '全部',
+    value: '',
+
+  },
+  {
+    name: '未打印',
+    value: '0',
+
+  },
+  {
+    name: '已打印',
+    value: '1',
+  },
+]
 const loadingTable = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '证书名称', value: 'customerNo', align: 'center', width: '160px' },
-  { text: '样品编号', value: 'customerName', align: 'center', width: '160px' },
-  { text: '样品名称', value: 'reciever', align: 'center', width: '180px' },
-  { text: '型号', value: 'deliverer', align: 'center', width: '180px' },
-  { text: '出厂编号', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '检测单位', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '打印状态', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '创建时间', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '证书编号', value: 'certificateCode', align: 'center', width: '160px' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160px' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '检测单位', value: 'outsourcerName', align: 'center' },
+  { text: '打印状态', value: 'printStatus', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
-const list = ref([])
-const total = ref(0)
+const list = ref<IList[]>([]) // 表格数据
+const total = ref(0) // 数据总数
+const checkoutList = ref<string[]>([]) // 选中的内容
 
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -46,17 +65,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  // getListPage(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   let interfaceStr = ''
-  //   for (const key in response.data.rows[0]) {
-  //     const item = response.data.rows[0][key]
-  //     interfaceStr += `${key}:${typeof (item)}\n`
-  //   }
-  //   console.log(interfaceStr)
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getcertificateList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -66,35 +79,100 @@
 // 清除条件
 const clearList = () => {
   listQuery.value = {
-    businessSize: '',
-    // evaluation: '',
-    formId: '',
-    grade: '',
-    outsourcerName: '',
-    outsourcerNo: '',
+    certificateCode: '', // 证书号
+    certificateName: '', // 证书名称
+    outsourcerId: '', // 检测单位,分包方id
+    printStatus: '', // 打印状态（1已打印、0未打印，不传为查询全部）
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
-  fetchData()
+  fetchData(true)
 }
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 exportAll = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      certificateCode: listQuery.value.certificateCode, // 证书号
+      certificateName: listQuery.value.certificateName, // 证书名称
+      outsourcerId: listQuery.value.outsourcerId, // 检测单位,分包方id
+      printStatus: listQuery.value.printStatus, // 打印状态（1已打印、0未打印，不传为查询全部）
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportcertificateList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '分包证书列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
 }
 // 打印
 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 = () => {
 
+// 点击编辑或详情
+const handleDetail = (row: IList, type: 'edit' | 'detail') => {
+  $router.push({
+    path: `/subpackage/certificate/${type}/${row.id}`,
+  })
 }
-// 选中
-const handleSelectionChange = () => {
 
+// 点击新建
+const add = (row: IList) => {
+  $router.push({
+    path: '/subpackage/add',
+  })
 }
-// 详情
-const handleDetail = (row) => {
+
+// 点击表格中的打印
+const print = (row: IList) => {
 
 }
 
@@ -109,28 +187,27 @@
     <app-container>
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
-          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="证书号" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.certificateCode" placeholder="证书号" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.outsourcerName" placeholder="证书名称" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessSize" placeholder="样品编号" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.sampleNo" placeholder="样品编号" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.grade" placeholder="样品名称" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.grade" placeholder="监测单位" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.outsourcerId" placeholder="检测单位" class="short-input" clearable />
         </search-item>
         <search-item>
           <el-select
-            v-model="listQuery.grade"
+            v-model="listQuery.printStatus"
             placeholder="打印状态"
             class="short-input"
           >
-            <el-option label="可打印" value="1" />
-            <el-option label="不可打印" value="2" />
+            <el-option v-for="(item, index) in printStatusList" :key="index" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
       </search-area>
@@ -138,7 +215,7 @@
         <template #btns-right>
           <icon-button icon="icon-import" title="批量导入" type="primary" />
           <icon-button icon="icon-template" title="模板下载" type="primary" />
-          <icon-button icon="icon-add" title="新建" type="primary" />
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
@@ -156,9 +233,15 @@
           <template #columns>
             <el-table-column label="操作" align="center" fixed="right" width="120">
               <template #default="{ row }">
-                <el-button size="small" link type="primary" @click="handleDetail(row)">
+                <el-button size="small" link type="primary" @click="handleDetail(row, 'edit')">
+                  编辑
+                </el-button>
+                <el-button size="small" link type="primary" @click="handleDetail(row, 'detail')">
                   详情
                 </el-button>
+                <el-button disabled size="small" link type="primary" @click="print(row)">
+                  打印
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 4559a80..b5dae4f 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -3,6 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import { el } from 'element-plus/es/locale'
 import type { IAbility, IMenu, IMenuDetail, Iperson } from './record-interface'
 import TemplateTable from './components/templateTable.vue'
 import { isNumber, validatePhone } from '@/utils/validate'
@@ -13,7 +14,9 @@
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { UpdateApprove, add, detail, failUpdateApprove, submit } from '@/api/business/subpackage/approval'
+import { detail } from '@/api/business/subpackage/approval'
+import { getListPage } from '@/api/business/subpackage/check'
+import { addAbilityList, addPersonList, delAbilityList, delPersonList, getAbilityList, getPersonList } from '@/api/business/subpackage/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('detail') // 页面类型: add, edit, detail
@@ -21,6 +24,7 @@
 const approvalStatusName = ref('') // 审批状态名字
 const $route = useRoute()
 const query = $route.query
+const isshowSave = ref(true) // 显示编辑保存按钮 false编辑 true保存
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -108,10 +112,18 @@
     evaluationList.value = response.data
   })
 }
+
 // -----------------------------------------表格--------------------------------------
 const SelectionList = ref([]) // 表格选中
 const abilityList: Ref<IAbility[]> = ref([]) // 业务能力列表
 const personList: Ref<Iperson[]> = ref([]) // 人员列表
+const tableQuery = ref({
+  outsourcerId: infoId.value,
+  offset: 1,
+  limit: 10,
+})
+const personTotal = ref(0) // 人员数据总数
+const abilityTotal = ref(0) // 业务能力数据总数
 
 // 其他关联数据列表
 const dataList = ref({
@@ -122,6 +134,63 @@
   certificationRecords: [], // 证书记录
 })
 
+const loadingTable = ref(false) // 表格loading
+const checkTotal = ref(0) // 项目记录
+const checkListQuery = ref({
+  applicantEndTime: '', // 开始时间
+  applicantName: '', // 申请人名称
+  applicantStartTime: '', // 结束时间
+  approvalStatus: '4', // 申请状态 4 已通过
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, // 表单id
+  outsourcerName: '', // 	分包方名称
+  projectName: '', // 分包项目名称
+  projectNo: '', // 分包项目编号
+  offset: 1,
+  limit: 20,
+})
+// 获取项目记录
+const fetchProjectRecords = function (isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    checkListQuery.value.offset = 1
+  }
+  // 模拟数据
+  getListPage(checkListQuery.value).then((response) => {
+    dataList.value.projectRecords = response.data.rows
+    checkTotal.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 获取合同记录
+const fetchContractRecords = () => {
+
+}
+// 获取检定证书 待测试
+const fetchCertifications = function () {
+  const postData = {
+    sampleId: '',
+    customeId: dataForm.value.id,
+  }
+  // getCertificationByCustomer(postData).then((res) => {
+  //   dataList.value.certificationRecords = res.data.rows
+  // })
+}
+// 获取人员列表
+const fetchPersonList = () => {
+  getPersonList(tableQuery.value).then((res) => {
+    personList.value = res.data.rows
+    personTotal.value = res.data.total
+  })
+}
+// 获取业务能力列表
+const fetchAbilityList = () => {
+  getAbilityList(tableQuery.value).then((res) => {
+    abilityList.value = res.data.rows
+    abilityTotal.value = res.data.total
+  })
+}
+
 const menuEdit = ref<IMenu[]>([
   {
     name: '分包方人员',
@@ -134,7 +203,7 @@
     ],
     pagination: false,
     list: 'personList',
-    searchFunc: null,
+    searchFunc: fetchCertifications,
   },
   {
     name: '业务能力',
@@ -145,27 +214,10 @@
     ],
     pagination: false,
     list: 'abilityList',
-    searchFunc: null,
+    searchFunc: fetchAbilityList,
   },
 ]) // 分包方人员和业务能力
 
-// 获取合同记录
-const fetchContractRecords = function () {
-  // getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.contractRecords = res.data.rows
-  // })
-}
-// 获取检定证书 待测试
-const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
-}
-
 const menuDetail = ref<IMenuDetail[]>([
   {
     name: '项目记录',
@@ -179,12 +231,7 @@
     ],
     pagination: true,
     list: 'projectRecords',
-    query: {
-      id: '',
-      limit: 10,
-      offset: 1,
-    },
-    searchFunc: null,
+    searchFunc: fetchProjectRecords,
   },
   {
     name: '合同记录',
@@ -224,6 +271,7 @@
     searchFunc: fetchCertifications,
   },
 ])
+
 const currentMenuEdit = ref('分包方人员')
 const currentMenuEditObj = computed(() => {
   return menuEdit.value.find(item => item.name === currentMenuEdit.value)
@@ -238,7 +286,7 @@
   department: '', // 部门
   job: '', // 职务
   name: '', // 名字
-  outsourcerId: '', // 分包方id
+  outsourcerId: infoId.value, // 分包方id
   phone: '', // 手机
   userNo: '', // 人员编号
   createTime: '', // 创建时间
@@ -249,20 +297,44 @@
 const addAbilityObj: IAbility = {
   abilityDesc: '', // 能力描述
   abilityName: '', // 能力名称
-  outsourcerId: '',
+  outsourcerId: infoId.value,
   price: '', // 报价
   createTime: '', // 创建时间
   id: '',
   editable: true,
 }
 
+// 改变页容量
+function handleSizeChange(val: number) {
+  tableQuery.value.offset = 1
+  tableQuery.value.limit = val
+  if (currentMenuEdit.value === '分包方人员') {
+    fetchPersonList()
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    fetchAbilityList()
+  }
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  tableQuery.value.offset = val
+  if (currentMenuEdit.value === '分包方人员') {
+    fetchPersonList()
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    fetchAbilityList()
+  }
+}
+
 // 检查列表
-function checkPersonList(list: any) {
+function checkPersonList(list: any, columns: any) {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
-    for (const prop of currentMenuEditObj.value!.columns) {
+    for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
+        console.log(';;;;', item, prop.value, item[prop.value])
+
         ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
         return false
       }
@@ -284,6 +356,33 @@
     item.editable = false
   }
 }
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (currentMenuDetail.value === '项目记录') {
+    if (val.value && currentMenuDetailObj) {
+      checkListQuery.value.offset = val.value.offset
+      checkListQuery.value.limit = val.value.limit
+      currentMenuDetailObj.value!.searchFunc!()
+    }
+  }
+}
+
+// 监听上面表格按钮切换
+watch(currentMenuEdit, (newVal) => {
+  tableQuery.value.offset = 1 // 切换按钮从第一页开始
+})
+
+// 监听下面按钮切换
+watch(currentMenuDetailObj, () => {
+  checkListQuery.value.offset = 1
+  currentMenuDetailObj.value!.searchFunc!()
+},
+{
+  deep: true,
+  immediate: true,
+})
+
 // -----------------------------------------人员信息------------------------------------------
 
 // 双击行显示输入框
@@ -304,40 +403,77 @@
     console.log('分包方人员增加')
 
     // 检查上一行必填项
-    if (checkPersonList(personList.value)) {
+    if (checkPersonList(personList.value, currentMenuEditObj.value!.columns)) {
       setAllRowReadable(personList.value)
-      personList.value.push({ ...addPersonObj })
+      personList.value.unshift({ ...addPersonObj })
     }
   }
   if (currentMenuEdit.value === '业务能力') {
     console.log('业务能力增加')
 
     // 检查上一行必填项
-    if (checkPersonList(abilityList.value)) {
+    if (checkPersonList(abilityList.value, currentMenuEditObj.value!.columns)) {
       setAllRowReadable(abilityList.value)
-      abilityList.value.push({ ...addAbilityObj })
+      abilityList.value.unshift({ ...addAbilityObj })
     }
   }
 }
 
 // 删除行
 const deleteList = () => {
-  if (currentMenuEdit.value === '分包方人员') {
-    personList.value = personList.value.filter((item: Iperson) => {
-      return !SelectionList.value.includes(item)
-    })
+  // 没有id的数据
+  const delListNoId = SelectionList.value.filter((item: Iperson) => !item.id)
+  // 含有id的数据
+  const delListhaveId = SelectionList.value.filter((item: Iperson) => item.id)
+  const ids = delListhaveId.map((item: any) => item.id)
+  // 前端删除数据
+  if (delListNoId.length) { // 全是没有id的
+    if (currentMenuEdit.value === '分包方人员') {
+      personList.value.shift()
+    }
+    if (currentMenuEdit.value === '业务能力') {
+      abilityList.value.shift()
+    }
+    if (delListNoId.length === SelectionList.value.length) { // 全是没有id的数据，前端删除
+      return
+    }
   }
-  if (currentMenuEdit.value === '业务能力') {
-    abilityList.value = abilityList.value.filter((item: IAbility) => {
-      return !SelectionList.value.includes(item)
+  // 删除数据库的数据
+  if (ids.length) {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      if (currentMenuEdit.value === '分包方人员') {
+        delPersonList({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchPersonList()
+          }
+        })
+      }
+      if (currentMenuEdit.value === '业务能力') {
+        delAbilityList({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchAbilityList()
+          }
+        })
+      }
     })
   }
 }
 // 表格选中
-const handleSelectionChange = (e: CustomerPerson[]) => {
+const handleSelectionChange = (e: any) => {
+  console.log(e)
+
   SelectionList.value = e
 }
-// -----------------------------------------业务能力-------------------------------------------------
 
 // ---------------------------------------------------------------------------------------------------
 // 获取详情表单
@@ -395,74 +531,51 @@
   extarCss: '',
 })
 
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      if (pageType.value === 'add') { // 新建
-        add(dataForm.value).then((res) => {
+// 保存表格
+function saveTable() {
+  if (!personList.value.length) {
+    ElMessage.warning('人员列表不能为空')
+    return
+  }
+  if (!abilityList.value.length) {
+    ElMessage.warning('业务能力列表不能为空')
+    return
+  }
+  if (checkPersonList(personList.value, menuEdit.value[0].columns) && checkPersonList(abilityList.value, menuEdit.value[1].columns)) {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      const personParams = personList.value.filter(item => !item.id)
+      const abilityParams = abilityList.value.filter(item => !item.id)
+      if (!personParams.length && !abilityParams.length) {
+        ElMessage.warning('人员和业务能力列表均无新增的数据')
+        return
+      }
+      if (personParams.length) {
+        addPersonList(personParams).then((res) => {
           if (res.code === 200) {
-            submitId.value = res.data.id
-            loading.close()
-            ElMessage.success('保存成功')
-            close()
+            ElMessage.success('人员列表保存成功')
+            setAllRowReadable(personList.value) // 将表格退出编辑模式
+            fetchPersonList() // 获取人员列表
           }
-        }).catch(() => {
-          loading.close()
         })
       }
-      else if (pageType.value === 'edit') { // 编辑
-        if (approvalStatusName.value === '未通过-驳回') {
-          failUpdateApprove(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              loading.close()
-              ElMessage.success('保存成功')
-              close()
-            }
-          }).catch(() => {
-            loading.close()
-          })
-        }
-        else { // 草稿箱和已取消
-          UpdateApprove(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              loading.close()
-              ElMessage.success('保存成功')
-              close()
-            }
-          }).catch(() => {
-            loading.close()
-          })
-        }
+      if (abilityParams.length) {
+        addAbilityList(abilityParams).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('业务能力列表保存成功')
+            setAllRowReadable(abilityList.value)
+            fetchAbilityList() // 获取业务能力列表
+          }
+        })
       }
-    }
-  })
-}
-// 提交
-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_SUBPACKAGE_APPROVE, // 表单id
-      processId: dataForm.value.processId, // 流程实例id
-    }
-    submit(params).then(() => {
-      ElMessage.success('已提交')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.warning('请先保存！')
   }
 }
 
@@ -498,6 +611,8 @@
     getInfo()
   }
   getDict()
+  fetchPersonList() // 获取人员列表
+  fetchAbilityList() // 获取业务能力列表
 })
 </script>
 
@@ -508,10 +623,10 @@
         <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button> -->
-        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
-          提交
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!isshowSave" type="primary" @click="editTable">
+          编辑
+        </el-button> -->
+        <el-button v-if="isshowSave" type="primary" @click="saveTable">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -795,7 +910,44 @@
             <el-input v-else v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
+        <!-- <el-table-column
+          label="操作"
+          align="center"
+          fixed="right"
+          width="90"
+        >
+          <template #default="{ row }">
+            <el-button
+              size="small"
+              type="primary"
+              link
+              @click="saveRow(row)"
+            >
+              <span v-if="!row.editable">编辑</span>
+              <span v-if="row.editable">保存</span>
+            </el-button>
+            <el-button
+              size="small"
+              type="danger"
+              link
+              @click="deleteRow(row)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column> -->
       </el-table>
+      <div style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="tableQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="tableQuery.limit"
+          :total="currentMenuEdit === '分包方人员' ? personTotal : abilityTotal"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <detail-block-switch :title="currentMenuDetail">
       <template #menu>
@@ -805,7 +957,7 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="currentMenuDetailObj" :columns="currentMenuDetailObj.columns" :list="dataList[currentMenuDetailObj.list]" :loading="false" :pagination="currentMenuDetailObj.pagination" @change-page="currentMenuDetailObj?.searchFunc" />
+      <template-table v-if="currentMenuDetailObj" :columns="currentMenuDetailObj.columns" :list="dataList[currentMenuDetailObj.list]" :loading="false" :pagination="currentMenuDetailObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>

diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 44d7b3a..a7e59fd 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -1,4 +1,24 @@
 /**
  * 分包方证书管理
  */
-// import request from '../../index'
+import request from '../../index'
+import type { IListQuery } from '@/views/business/subpackage/certificate/certificate-interface'
+
+// 列表查询
+export function getcertificateList(data: IListQuery) {
+  return request({
+    url: `/business/outsourceCertificate/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportcertificateList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: '/business/outsourceCertificate/listExport',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2920b0c..10cba6f 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -22,3 +22,57 @@
     data,
   })
 }
+
+// 人员列表查询
+export function getPersonList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerUser/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表删除
+export function delPersonList(data: any) {
+  return request({
+    url: '/business/outsourcerUser/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 人员列表新增
+export function addPersonList(data: Object) {
+  return request({
+    url: '/business/outsourcerUser/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力列表查询
+export function getAbilityList(data: { outsourcerId: string; offset?: number; limit?: number }) {
+  return request({
+    url: `/business/outsourcerAbility/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力删除
+export function delAbilityList(data: any) {
+  return request({
+    url: '/business/outsourcerAbility/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 业务能力新增
+export function addAbilityList(data: Object) {
+  return request({
+    url: '/business/outsourcerAbility/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index aa682e8..456fe93 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -504,28 +504,28 @@
           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: 'subpackage/certificate/detail/:id?',
+        path: ':type/: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: 'taskDetail',
-        component: () => import('@/views/business/subpackage/certificate/edit.vue'),
-        meta: {
           title: '分包证书详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/schedule/taskList',
+          activeMenu: '/subpackage/certificate',
         },
       },
     ],
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 7468e71..97d0ece 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -498,8 +498,8 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d8fc8e3..7c17365 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -376,7 +376,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
                   v-model="sampleForm.postalCode"
@@ -385,7 +385,7 @@
                   disabled
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
index d24220d..1305751 100644
--- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -34,13 +34,13 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
-  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
-  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -62,7 +62,12 @@
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
+      return {
+        ...item,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -135,7 +140,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
index 405bcdc..2caa2a2 100644
--- a/src/views/business/subpackage/apply/components/selectProjectNo.vue
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -124,7 +124,7 @@
 <template>
   <div class="select-kehu-dialog">
     <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-area :need-clear="true" style="padding-left: 0;padding-right: 0;" @search="searchList" @clear="clearList">
         <search-item>
           <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
         </search-item>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 671105f..fd6f673 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -248,7 +248,7 @@
   }
 }
 
-// 选择项目id
+// 选择分包方
 const clickConfirmProject = (val: any) => {
   detailForm.value.outsourcerId = val[0].id // 分包方id
   detailForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
diff --git a/src/views/business/subpackage/certificate/certificate-interface.ts b/src/views/business/subpackage/certificate/certificate-interface.ts
new file mode 100644
index 0000000..6b96a33
--- /dev/null
+++ b/src/views/business/subpackage/certificate/certificate-interface.ts
@@ -0,0 +1,44 @@
+// 查询条件
+export interface IListQuery {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerId: string // 检测单位,分包方id
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
+
+// 表格数据
+export interface IList {
+  id: string
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  outsourcerName: string // 检测单位名称
+  printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  createTime: string // 创建时间
+}
+
+// 详情表单
+export interface IForm {
+  certificateCode: string // 证书号
+  certificateName: string // 证书名称
+  expirationDate: string // 证书有效期
+  issuanceDate: string // 证书出具日期
+  certificateFile: string // 证书文件
+  originalRecordFile: string // 原始记录文件
+  orderId: string // 委托书id
+  outsourcerId: string // 分包方id
+  outsourcerNo: string // 分包方编号
+  outsourcerName: string // 检测单位名称-分包方名称
+  sampleId: string // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+}
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 7eedf38..978e2a0 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -1,13 +1,277 @@
 <!-- 分包证书管理详情 -->
 <script lang="ts" setup name="CertificateEdit">
-// 逻辑代码
+import type { Ref } from 'vue'
+import { 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 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'
+
+// 初始化router
+const $router = useRouter()
+const $route = useRoute()
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const projectVisible = ref(false) // 控制选择分包方对话框显隐
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const dataForm: Ref<IForm> = ref({
+  certificateCode: '', // 证书号
+  certificateName: '', // 证书名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 证书出具日期
+  certificateFile: '', // 证书文件
+  originalRecordFile: '', // 原始记录文件
+  orderId: '', // 委托书id
+  outsourcerId: '', // 分包方id
+  outsourcerName: '', // 检测单位名称-分包方名称
+  outsourcerNo: '', // 分包方编号
+  sampleId: '', // 样品id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
+})// 表单
+const ruleFormRef = ref<FormInstance>() // 表单ref
+// 校验规则
+const rules = ref({
+  // sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  // manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  certificateCode: [{ required: true, message: '要求证书编号不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '要求证书名称不能为空', trigger: 'blur' }],
+  expirationDate: [{ required: true, message: '要求证书有效期不能为空', trigger: 'blur, change' }],
+  issuanceDate: [{ required: true, message: '要求证书出具日期不能为空', trigger: 'blur, change' }],
+  outsourcerName: [{ required: true, message: '要求样检测单位名称不能为空', trigger: 'blur, change' }],
+  sampleNo: [{ required: true, message: '要求样品编号不能为空', trigger: 'blur, change' }],
+}) // 表单验证规则
+
+// 关闭
+const close = () => {
+  $router.back()
+}
+
+// -----------------------------------------路由参数--------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+console.log(';;;;;;;;;;;;;;', $route.params)
+
+// ------------------------------------------选择样品---------------------------------------
+// 点击选择样品
+const handleSelectSample = () => {
+  if (!dataForm.value.outsourcerId) {
+    ElMessage.warning('请先选择检测单位')
+    return
+  }
+  sampleVisible.value = true // 选择样品对话框显隐
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+
+}
+// -----------------------------------------选择分包方------------------------------------------
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+// 点击选择分包方
+const handleSelectOutsourcer = () => {
+  projectVisible.value = true // 选择分包方对话框显隐
+}
+// 选择分好包方
+const clickConfirmProject = (val: any) => {
+  dataForm.value.outsourcerId = val[0].id // 分包方id
+  dataForm.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
+  dataForm.value.outsourcerName = val[0].outsourcerName // 公司名称
+}
+// ---------------------------------------------------------------------------------------
+// 点击保存
+const saveForm = () => {
+
+}
 </script>
 
 <template>
   <div>
     <!-- 布局 -->
     <app-container>
-      555
+      <detail-page v-loading="loading" :title="`分包证书管理-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+            :rules="rules"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="证书编号:" prop="certificateCode">
+                  <el-input
+                    v-model="dataForm.certificateCode"
+                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="证书名称:" prop="certificateName">
+                  <el-input
+                    v-model.trim="dataForm.certificateName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col><el-col :span="6">
+                <el-form-item label="证书有效期 :" prop="expirationDate">
+                  <el-date-picker
+                    v-model="dataForm.expirationDate"
+                    type="date"
+                    style="width: 100%;"
+                    :placeholder="pageType === 'detail' ? '' : '请选择证书有效期'"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="证书出具日期  :" prop="issuanceDate">
+                  <el-date-picker
+                    v-model="dataForm.issuanceDate"
+                    type="date"
+                    style="width: 100%;"
+                    :placeholder="pageType === 'detail' ? '' : '请选择证书出具日期 '"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="检测单位:" prop="outsourcerName">
+                  <el-input
+                    v-model="dataForm.outsourcerName"
+                    :placeholder="pageType === 'detail' ? '' : '请选择检测单位'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template #append>
+                      <el-button size="small" @click="handleSelectOutsourcer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品编号:" prop="sampleNo">
+                  <el-input
+                    v-model="dataForm.sampleNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择样品'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template #append>
+                      <el-button size="small" @click="handleSelectSample">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品名称:" prop="sampleName">
+                  <el-input
+                    v-model="dataForm.sampleName"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="样品型号:" prop="sampleModel">
+                  <el-input
+                    v-model="dataForm.sampleModel"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="出厂编号:" prop="manufacturingNo">
+                  <el-input
+                    v-model="dataForm.manufacturingNo"
+                    :placeholder="pageType === 'detail' ? '' : ''"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="14">
+                <el-form-item label="原始记录附件:">
+                  <show-photo v-if="dataForm.originalRecordFile" :minio-file-name="dataForm.originalRecordFile" />
+                  <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.originalRecordFile === '' ? '0px' : '20px' }" @click="upload">
+                    {{ dataForm.originalRecordFile === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="14">
+                <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">
+                    {{ dataForm.certificateFile === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 项目选择 -->
+      <select-project-approve
+        v-model:visible="projectVisible" @clickConfirmProject="clickConfirmProject"
+        @change-visible="changeProjectVisible(false)"
+      />
+      <!-- 样品增加弹窗 -->
+      <select-sample v-model:visible="sampleVisible" :is-multi="false" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index ada0f7b..868f00d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -4,38 +4,57 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IListQueryRecord } from '../subpackage-interface'
+import type { IList, IListQuery } from './certificate-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
-const listQuery: Ref<IListQueryRecord> = ref({
-  businessSize: '', // 业务规模-字典code
-  formId: SCHEDULE.BUSINESS_SUBPACKAGE_MANAGE, // 表单id
-  grade: '', // 	履约评级-字典code
-  ids: [],
-  outsourcerName: '', // 分包方公司名字
-  outsourcerNo: '', // 编号
+const listQuery: Ref<IListQuery> = ref({
+  certificateCode: '', // 证书号
+  certificateName: '', // 证书名称
+  outsourcerId: '', // 检测单位,分包方id
+  printStatus: '', // 打印状态（1已打印、0未打印，不传为查询全部）
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
+const printStatusList = [
+  {
+    name: '全部',
+    value: '',
+
+  },
+  {
+    name: '未打印',
+    value: '0',
+
+  },
+  {
+    name: '已打印',
+    value: '1',
+  },
+]
 const loadingTable = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '证书名称', value: 'customerNo', align: 'center', width: '160px' },
-  { text: '样品编号', value: 'customerName', align: 'center', width: '160px' },
-  { text: '样品名称', value: 'reciever', align: 'center', width: '180px' },
-  { text: '型号', value: 'deliverer', align: 'center', width: '180px' },
-  { text: '出厂编号', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '检测单位', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '打印状态', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '创建时间', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '证书编号', value: 'certificateCode', align: 'center', width: '160px' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160px' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '检测单位', value: 'outsourcerName', align: 'center' },
+  { text: '打印状态', value: 'printStatus', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
-const list = ref([])
-const total = ref(0)
+const list = ref<IList[]>([]) // 表格数据
+const total = ref(0) // 数据总数
+const checkoutList = ref<string[]>([]) // 选中的内容
 
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -46,17 +65,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  // getListPage(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   let interfaceStr = ''
-  //   for (const key in response.data.rows[0]) {
-  //     const item = response.data.rows[0][key]
-  //     interfaceStr += `${key}:${typeof (item)}\n`
-  //   }
-  //   console.log(interfaceStr)
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getcertificateList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -66,35 +79,100 @@
 // 清除条件
 const clearList = () => {
   listQuery.value = {
-    businessSize: '',
-    // evaluation: '',
-    formId: '',
-    grade: '',
-    outsourcerName: '',
-    outsourcerNo: '',
+    certificateCode: '', // 证书号
+    certificateName: '', // 证书名称
+    outsourcerId: '', // 检测单位,分包方id
+    printStatus: '', // 打印状态（1已打印、0未打印，不传为查询全部）
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
-  fetchData()
+  fetchData(true)
 }
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 exportAll = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      certificateCode: listQuery.value.certificateCode, // 证书号
+      certificateName: listQuery.value.certificateName, // 证书名称
+      outsourcerId: listQuery.value.outsourcerId, // 检测单位,分包方id
+      printStatus: listQuery.value.printStatus, // 打印状态（1已打印、0未打印，不传为查询全部）
+      sampleName: listQuery.value.sampleName, // 样品名称
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportcertificateList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '分包证书列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
 }
 // 打印
 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 = () => {
 
+// 点击编辑或详情
+const handleDetail = (row: IList, type: 'edit' | 'detail') => {
+  $router.push({
+    path: `/subpackage/certificate/${type}/${row.id}`,
+  })
 }
-// 选中
-const handleSelectionChange = () => {
 
+// 点击新建
+const add = (row: IList) => {
+  $router.push({
+    path: '/subpackage/add',
+  })
 }
-// 详情
-const handleDetail = (row) => {
+
+// 点击表格中的打印
+const print = (row: IList) => {
 
 }
 
@@ -109,28 +187,27 @@
     <app-container>
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
-          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="证书号" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.certificateCode" placeholder="证书号" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.outsourcerName" placeholder="证书名称" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessSize" placeholder="样品编号" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.sampleNo" placeholder="样品编号" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.grade" placeholder="样品名称" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.grade" placeholder="监测单位" class="short-input" clearable />
+          <el-input v-model.trim="listQuery.outsourcerId" placeholder="检测单位" class="short-input" clearable />
         </search-item>
         <search-item>
           <el-select
-            v-model="listQuery.grade"
+            v-model="listQuery.printStatus"
             placeholder="打印状态"
             class="short-input"
           >
-            <el-option label="可打印" value="1" />
-            <el-option label="不可打印" value="2" />
+            <el-option v-for="(item, index) in printStatusList" :key="index" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
       </search-area>
@@ -138,7 +215,7 @@
         <template #btns-right>
           <icon-button icon="icon-import" title="批量导入" type="primary" />
           <icon-button icon="icon-template" title="模板下载" type="primary" />
-          <icon-button icon="icon-add" title="新建" type="primary" />
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
@@ -156,9 +233,15 @@
           <template #columns>
             <el-table-column label="操作" align="center" fixed="right" width="120">
               <template #default="{ row }">
-                <el-button size="small" link type="primary" @click="handleDetail(row)">
+                <el-button size="small" link type="primary" @click="handleDetail(row, 'edit')">
+                  编辑
+                </el-button>
+                <el-button size="small" link type="primary" @click="handleDetail(row, 'detail')">
                   详情
                 </el-button>
+                <el-button disabled size="small" link type="primary" @click="print(row)">
+                  打印
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 4559a80..b5dae4f 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -3,6 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import { el } from 'element-plus/es/locale'
 import type { IAbility, IMenu, IMenuDetail, Iperson } from './record-interface'
 import TemplateTable from './components/templateTable.vue'
 import { isNumber, validatePhone } from '@/utils/validate'
@@ -13,7 +14,9 @@
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { UpdateApprove, add, detail, failUpdateApprove, submit } from '@/api/business/subpackage/approval'
+import { detail } from '@/api/business/subpackage/approval'
+import { getListPage } from '@/api/business/subpackage/check'
+import { addAbilityList, addPersonList, delAbilityList, delPersonList, getAbilityList, getPersonList } from '@/api/business/subpackage/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('detail') // 页面类型: add, edit, detail
@@ -21,6 +24,7 @@
 const approvalStatusName = ref('') // 审批状态名字
 const $route = useRoute()
 const query = $route.query
+const isshowSave = ref(true) // 显示编辑保存按钮 false编辑 true保存
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -108,10 +112,18 @@
     evaluationList.value = response.data
   })
 }
+
 // -----------------------------------------表格--------------------------------------
 const SelectionList = ref([]) // 表格选中
 const abilityList: Ref<IAbility[]> = ref([]) // 业务能力列表
 const personList: Ref<Iperson[]> = ref([]) // 人员列表
+const tableQuery = ref({
+  outsourcerId: infoId.value,
+  offset: 1,
+  limit: 10,
+})
+const personTotal = ref(0) // 人员数据总数
+const abilityTotal = ref(0) // 业务能力数据总数
 
 // 其他关联数据列表
 const dataList = ref({
@@ -122,6 +134,63 @@
   certificationRecords: [], // 证书记录
 })
 
+const loadingTable = ref(false) // 表格loading
+const checkTotal = ref(0) // 项目记录
+const checkListQuery = ref({
+  applicantEndTime: '', // 开始时间
+  applicantName: '', // 申请人名称
+  applicantStartTime: '', // 结束时间
+  approvalStatus: '4', // 申请状态 4 已通过
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, // 表单id
+  outsourcerName: '', // 	分包方名称
+  projectName: '', // 分包项目名称
+  projectNo: '', // 分包项目编号
+  offset: 1,
+  limit: 20,
+})
+// 获取项目记录
+const fetchProjectRecords = function (isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    checkListQuery.value.offset = 1
+  }
+  // 模拟数据
+  getListPage(checkListQuery.value).then((response) => {
+    dataList.value.projectRecords = response.data.rows
+    checkTotal.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 获取合同记录
+const fetchContractRecords = () => {
+
+}
+// 获取检定证书 待测试
+const fetchCertifications = function () {
+  const postData = {
+    sampleId: '',
+    customeId: dataForm.value.id,
+  }
+  // getCertificationByCustomer(postData).then((res) => {
+  //   dataList.value.certificationRecords = res.data.rows
+  // })
+}
+// 获取人员列表
+const fetchPersonList = () => {
+  getPersonList(tableQuery.value).then((res) => {
+    personList.value = res.data.rows
+    personTotal.value = res.data.total
+  })
+}
+// 获取业务能力列表
+const fetchAbilityList = () => {
+  getAbilityList(tableQuery.value).then((res) => {
+    abilityList.value = res.data.rows
+    abilityTotal.value = res.data.total
+  })
+}
+
 const menuEdit = ref<IMenu[]>([
   {
     name: '分包方人员',
@@ -134,7 +203,7 @@
     ],
     pagination: false,
     list: 'personList',
-    searchFunc: null,
+    searchFunc: fetchCertifications,
   },
   {
     name: '业务能力',
@@ -145,27 +214,10 @@
     ],
     pagination: false,
     list: 'abilityList',
-    searchFunc: null,
+    searchFunc: fetchAbilityList,
   },
 ]) // 分包方人员和业务能力
 
-// 获取合同记录
-const fetchContractRecords = function () {
-  // getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.contractRecords = res.data.rows
-  // })
-}
-// 获取检定证书 待测试
-const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
-}
-
 const menuDetail = ref<IMenuDetail[]>([
   {
     name: '项目记录',
@@ -179,12 +231,7 @@
     ],
     pagination: true,
     list: 'projectRecords',
-    query: {
-      id: '',
-      limit: 10,
-      offset: 1,
-    },
-    searchFunc: null,
+    searchFunc: fetchProjectRecords,
   },
   {
     name: '合同记录',
@@ -224,6 +271,7 @@
     searchFunc: fetchCertifications,
   },
 ])
+
 const currentMenuEdit = ref('分包方人员')
 const currentMenuEditObj = computed(() => {
   return menuEdit.value.find(item => item.name === currentMenuEdit.value)
@@ -238,7 +286,7 @@
   department: '', // 部门
   job: '', // 职务
   name: '', // 名字
-  outsourcerId: '', // 分包方id
+  outsourcerId: infoId.value, // 分包方id
   phone: '', // 手机
   userNo: '', // 人员编号
   createTime: '', // 创建时间
@@ -249,20 +297,44 @@
 const addAbilityObj: IAbility = {
   abilityDesc: '', // 能力描述
   abilityName: '', // 能力名称
-  outsourcerId: '',
+  outsourcerId: infoId.value,
   price: '', // 报价
   createTime: '', // 创建时间
   id: '',
   editable: true,
 }
 
+// 改变页容量
+function handleSizeChange(val: number) {
+  tableQuery.value.offset = 1
+  tableQuery.value.limit = val
+  if (currentMenuEdit.value === '分包方人员') {
+    fetchPersonList()
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    fetchAbilityList()
+  }
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  tableQuery.value.offset = val
+  if (currentMenuEdit.value === '分包方人员') {
+    fetchPersonList()
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    fetchAbilityList()
+  }
+}
+
 // 检查列表
-function checkPersonList(list: any) {
+function checkPersonList(list: any, columns: any) {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
-    for (const prop of currentMenuEditObj.value!.columns) {
+    for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
+        console.log(';;;;', item, prop.value, item[prop.value])
+
         ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
         return false
       }
@@ -284,6 +356,33 @@
     item.editable = false
   }
 }
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (currentMenuDetail.value === '项目记录') {
+    if (val.value && currentMenuDetailObj) {
+      checkListQuery.value.offset = val.value.offset
+      checkListQuery.value.limit = val.value.limit
+      currentMenuDetailObj.value!.searchFunc!()
+    }
+  }
+}
+
+// 监听上面表格按钮切换
+watch(currentMenuEdit, (newVal) => {
+  tableQuery.value.offset = 1 // 切换按钮从第一页开始
+})
+
+// 监听下面按钮切换
+watch(currentMenuDetailObj, () => {
+  checkListQuery.value.offset = 1
+  currentMenuDetailObj.value!.searchFunc!()
+},
+{
+  deep: true,
+  immediate: true,
+})
+
 // -----------------------------------------人员信息------------------------------------------
 
 // 双击行显示输入框
@@ -304,40 +403,77 @@
     console.log('分包方人员增加')
 
     // 检查上一行必填项
-    if (checkPersonList(personList.value)) {
+    if (checkPersonList(personList.value, currentMenuEditObj.value!.columns)) {
       setAllRowReadable(personList.value)
-      personList.value.push({ ...addPersonObj })
+      personList.value.unshift({ ...addPersonObj })
     }
   }
   if (currentMenuEdit.value === '业务能力') {
     console.log('业务能力增加')
 
     // 检查上一行必填项
-    if (checkPersonList(abilityList.value)) {
+    if (checkPersonList(abilityList.value, currentMenuEditObj.value!.columns)) {
       setAllRowReadable(abilityList.value)
-      abilityList.value.push({ ...addAbilityObj })
+      abilityList.value.unshift({ ...addAbilityObj })
     }
   }
 }
 
 // 删除行
 const deleteList = () => {
-  if (currentMenuEdit.value === '分包方人员') {
-    personList.value = personList.value.filter((item: Iperson) => {
-      return !SelectionList.value.includes(item)
-    })
+  // 没有id的数据
+  const delListNoId = SelectionList.value.filter((item: Iperson) => !item.id)
+  // 含有id的数据
+  const delListhaveId = SelectionList.value.filter((item: Iperson) => item.id)
+  const ids = delListhaveId.map((item: any) => item.id)
+  // 前端删除数据
+  if (delListNoId.length) { // 全是没有id的
+    if (currentMenuEdit.value === '分包方人员') {
+      personList.value.shift()
+    }
+    if (currentMenuEdit.value === '业务能力') {
+      abilityList.value.shift()
+    }
+    if (delListNoId.length === SelectionList.value.length) { // 全是没有id的数据，前端删除
+      return
+    }
   }
-  if (currentMenuEdit.value === '业务能力') {
-    abilityList.value = abilityList.value.filter((item: IAbility) => {
-      return !SelectionList.value.includes(item)
+  // 删除数据库的数据
+  if (ids.length) {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      if (currentMenuEdit.value === '分包方人员') {
+        delPersonList({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchPersonList()
+          }
+        })
+      }
+      if (currentMenuEdit.value === '业务能力') {
+        delAbilityList({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchAbilityList()
+          }
+        })
+      }
     })
   }
 }
 // 表格选中
-const handleSelectionChange = (e: CustomerPerson[]) => {
+const handleSelectionChange = (e: any) => {
+  console.log(e)
+
   SelectionList.value = e
 }
-// -----------------------------------------业务能力-------------------------------------------------
 
 // ---------------------------------------------------------------------------------------------------
 // 获取详情表单
@@ -395,74 +531,51 @@
   extarCss: '',
 })
 
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      const loading = ElLoading.service({
-        lock: true,
-        background: 'rgba(255, 255, 255, 0.8)',
-      })
-      if (pageType.value === 'add') { // 新建
-        add(dataForm.value).then((res) => {
+// 保存表格
+function saveTable() {
+  if (!personList.value.length) {
+    ElMessage.warning('人员列表不能为空')
+    return
+  }
+  if (!abilityList.value.length) {
+    ElMessage.warning('业务能力列表不能为空')
+    return
+  }
+  if (checkPersonList(personList.value, menuEdit.value[0].columns) && checkPersonList(abilityList.value, menuEdit.value[1].columns)) {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      const personParams = personList.value.filter(item => !item.id)
+      const abilityParams = abilityList.value.filter(item => !item.id)
+      if (!personParams.length && !abilityParams.length) {
+        ElMessage.warning('人员和业务能力列表均无新增的数据')
+        return
+      }
+      if (personParams.length) {
+        addPersonList(personParams).then((res) => {
           if (res.code === 200) {
-            submitId.value = res.data.id
-            loading.close()
-            ElMessage.success('保存成功')
-            close()
+            ElMessage.success('人员列表保存成功')
+            setAllRowReadable(personList.value) // 将表格退出编辑模式
+            fetchPersonList() // 获取人员列表
           }
-        }).catch(() => {
-          loading.close()
         })
       }
-      else if (pageType.value === 'edit') { // 编辑
-        if (approvalStatusName.value === '未通过-驳回') {
-          failUpdateApprove(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              loading.close()
-              ElMessage.success('保存成功')
-              close()
-            }
-          }).catch(() => {
-            loading.close()
-          })
-        }
-        else { // 草稿箱和已取消
-          UpdateApprove(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              loading.close()
-              ElMessage.success('保存成功')
-              close()
-            }
-          }).catch(() => {
-            loading.close()
-          })
-        }
+      if (abilityParams.length) {
+        addAbilityList(abilityParams).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('业务能力列表保存成功')
+            setAllRowReadable(abilityList.value)
+            fetchAbilityList() // 获取业务能力列表
+          }
+        })
       }
-    }
-  })
-}
-// 提交
-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_SUBPACKAGE_APPROVE, // 表单id
-      processId: dataForm.value.processId, // 流程实例id
-    }
-    submit(params).then(() => {
-      ElMessage.success('已提交')
-      loading.close()
-      close()
-    })
-  }
-  else {
-    ElMessage.warning('请先保存！')
   }
 }
 
@@ -498,6 +611,8 @@
     getInfo()
   }
   getDict()
+  fetchPersonList() // 获取人员列表
+  fetchAbilityList() // 获取业务能力列表
 })
 </script>
 
@@ -508,10 +623,10 @@
         <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button> -->
-        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
-          提交
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!isshowSave" type="primary" @click="editTable">
+          编辑
+        </el-button> -->
+        <el-button v-if="isshowSave" type="primary" @click="saveTable">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -795,7 +910,44 @@
             <el-input v-else v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
+        <!-- <el-table-column
+          label="操作"
+          align="center"
+          fixed="right"
+          width="90"
+        >
+          <template #default="{ row }">
+            <el-button
+              size="small"
+              type="primary"
+              link
+              @click="saveRow(row)"
+            >
+              <span v-if="!row.editable">编辑</span>
+              <span v-if="row.editable">保存</span>
+            </el-button>
+            <el-button
+              size="small"
+              type="danger"
+              link
+              @click="deleteRow(row)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column> -->
       </el-table>
+      <div style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="tableQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="tableQuery.limit"
+          :total="currentMenuEdit === '分包方人员' ? personTotal : abilityTotal"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <detail-block-switch :title="currentMenuDetail">
       <template #menu>
@@ -805,7 +957,7 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="currentMenuDetailObj" :columns="currentMenuDetailObj.columns" :list="dataList[currentMenuDetailObj.list]" :loading="false" :pagination="currentMenuDetailObj.pagination" @change-page="currentMenuDetailObj?.searchFunc" />
+      <template-table v-if="currentMenuDetailObj" :columns="currentMenuDetailObj.columns" :list="dataList[currentMenuDetailObj.list]" :loading="false" :pagination="currentMenuDetailObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/subpackage/record/record-interface.ts b/src/views/business/subpackage/record/record-interface.ts
index 1725f9f..d81b61e 100644
--- a/src/views/business/subpackage/record/record-interface.ts
+++ b/src/views/business/subpackage/record/record-interface.ts
@@ -23,7 +23,8 @@
   name: string
   columns: TableColumn[]
   pagination: boolean
-  query?: { id: string; limit: number; offset: number }
+  // query?: { id: string; limit: number; offset: number }
+  query?: any
   list: 'projectRecords' | 'contractRecords' | 'certificationRecords'
   searchFunc: Function | null
 }