diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index af4ff99..42da39b 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -17,7 +17,6 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const approvalDialog = ref() // 审批对话ref
-
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -101,10 +100,10 @@
   }
   // 模拟数据
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item) => {
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCountryName + item.addressCityName + item.addressAreaName + item.fullAddress : item.addressCountryName + item.addressProvinceName + item.addressCityName + item.addressAreaName + item.fullAddress,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
@@ -116,7 +115,16 @@
 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 clearList = () => {
   listQuery.value = {

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index af4ff99..42da39b 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -17,7 +17,6 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const approvalDialog = ref() // 审批对话ref
-
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -101,10 +100,10 @@
   }
   // 模拟数据
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item) => {
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCountryName + item.addressCityName + item.addressAreaName + item.fullAddress : item.addressCountryName + item.addressProvinceName + item.addressCityName + item.addressAreaName + item.fullAddress,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
@@ -116,7 +115,16 @@
 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 clearList = () => {
   listQuery.value = {
diff --git a/src/views/business/subpackage/record/components/addRow.vue b/src/views/business/subpackage/record/components/addRow.vue
deleted file mode 100644
index 07b03d1..0000000
--- a/src/views/business/subpackage/record/components/addRow.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '110px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '周检记录',
-    form: {
-
-    },
-  },
-  {
-    name: '状态变更记录',
-    form: {
-
-    },
-  },
-  {
-    name: '使用记录',
-    form: {
-
-    },
-  },
-  {
-    name: '检定证书',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '周检记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="检定日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="有效日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="送检人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '状态变更记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
-                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="申请人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '使用记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '检定证书'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书出具日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书有效期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index af4ff99..42da39b 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -17,7 +17,6 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const approvalDialog = ref() // 审批对话ref
-
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -101,10 +100,10 @@
   }
   // 模拟数据
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item) => {
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCountryName + item.addressCityName + item.addressAreaName + item.fullAddress : item.addressCountryName + item.addressProvinceName + item.addressCityName + item.addressAreaName + item.fullAddress,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
@@ -116,7 +115,16 @@
 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 clearList = () => {
   listQuery.value = {
diff --git a/src/views/business/subpackage/record/components/addRow.vue b/src/views/business/subpackage/record/components/addRow.vue
deleted file mode 100644
index 07b03d1..0000000
--- a/src/views/business/subpackage/record/components/addRow.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '110px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '周检记录',
-    form: {
-
-    },
-  },
-  {
-    name: '状态变更记录',
-    form: {
-
-    },
-  },
-  {
-    name: '使用记录',
-    form: {
-
-    },
-  },
-  {
-    name: '检定证书',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '周检记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="检定日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="有效日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="送检人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '状态变更记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
-                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="申请人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '使用记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '检定证书'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书出具日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书有效期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/business/subpackage/record/components/outsourcerAbility.vue b/src/views/business/subpackage/record/components/outsourcerAbility.vue
deleted file mode 100644
index 7a91322..0000000
--- a/src/views/business/subpackage/record/components/outsourcerAbility.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- 分包方业务能力 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerAbility } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerAbility>({
-  abilityDesc: '', // 能力描述
-  abilityName: '', // 能力名称
-  createTime: '', // 创建时间（列表返回参数）
-  id: '', //
-  outsourcerId: '', // 分包方id
-  price: '', // 报价
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '能力名称', value: 'abilityName', align: 'center', width: '160px' },
-  { text: '能力描述', value: 'abilityDesc', align: 'center' },
-  { text: '报价', value: 'price', align: 'center', width: '160px' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index af4ff99..42da39b 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -17,7 +17,6 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const approvalDialog = ref() // 审批对话ref
-
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -101,10 +100,10 @@
   }
   // 模拟数据
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item) => {
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCountryName + item.addressCityName + item.addressAreaName + item.fullAddress : item.addressCountryName + item.addressProvinceName + item.addressCityName + item.addressAreaName + item.fullAddress,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
@@ -116,7 +115,16 @@
 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 clearList = () => {
   listQuery.value = {
diff --git a/src/views/business/subpackage/record/components/addRow.vue b/src/views/business/subpackage/record/components/addRow.vue
deleted file mode 100644
index 07b03d1..0000000
--- a/src/views/business/subpackage/record/components/addRow.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '110px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '周检记录',
-    form: {
-
-    },
-  },
-  {
-    name: '状态变更记录',
-    form: {
-
-    },
-  },
-  {
-    name: '使用记录',
-    form: {
-
-    },
-  },
-  {
-    name: '检定证书',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '周检记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="检定日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="有效日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="送检人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '状态变更记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
-                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="申请人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '使用记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '检定证书'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书出具日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书有效期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/business/subpackage/record/components/outsourcerAbility.vue b/src/views/business/subpackage/record/components/outsourcerAbility.vue
deleted file mode 100644
index 7a91322..0000000
--- a/src/views/business/subpackage/record/components/outsourcerAbility.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- 分包方业务能力 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerAbility } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerAbility>({
-  abilityDesc: '', // 能力描述
-  abilityName: '', // 能力名称
-  createTime: '', // 创建时间（列表返回参数）
-  id: '', //
-  outsourcerId: '', // 分包方id
-  price: '', // 报价
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '能力名称', value: 'abilityName', align: 'center', width: '160px' },
-  { text: '能力描述', value: 'abilityDesc', align: 'center' },
-  { text: '报价', value: 'price', align: 'center', width: '160px' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/outsourcerUser.vue b/src/views/business/subpackage/record/components/outsourcerUser.vue
deleted file mode 100644
index 4f9a310..0000000
--- a/src/views/business/subpackage/record/components/outsourcerUser.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- 分包方人员 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerUser } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerUser>({
-  createTime: '', // 创建时间（列表返回参数）
-  department: '', // 部门
-  id: '', //
-  job: '', // 职务
-  name: '', // 人员名字
-  outsourcerId: '', // 分包方id
-  phone: '', // 联系方式
-  userNo: '', // 人员编号-手动输入
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center', width: '160px' },
-  { text: '工作部门', value: 'department', align: 'center' },
-  { text: '职务', value: 'job', align: 'center', width: '160px' },
-  { text: '联系方式', value: 'phone', align: 'center' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index af4ff99..42da39b 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -17,7 +17,6 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const approvalDialog = ref() // 审批对话ref
-
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -101,10 +100,10 @@
   }
   // 模拟数据
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item) => {
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCountryName + item.addressCityName + item.addressAreaName + item.fullAddress : item.addressCountryName + item.addressProvinceName + item.addressCityName + item.addressAreaName + item.fullAddress,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
@@ -116,7 +115,16 @@
 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 clearList = () => {
   listQuery.value = {
diff --git a/src/views/business/subpackage/record/components/addRow.vue b/src/views/business/subpackage/record/components/addRow.vue
deleted file mode 100644
index 07b03d1..0000000
--- a/src/views/business/subpackage/record/components/addRow.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '110px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '周检记录',
-    form: {
-
-    },
-  },
-  {
-    name: '状态变更记录',
-    form: {
-
-    },
-  },
-  {
-    name: '使用记录',
-    form: {
-
-    },
-  },
-  {
-    name: '检定证书',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '周检记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="检定日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="有效日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="送检人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '状态变更记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
-                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="申请人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '使用记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '检定证书'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书出具日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书有效期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/business/subpackage/record/components/outsourcerAbility.vue b/src/views/business/subpackage/record/components/outsourcerAbility.vue
deleted file mode 100644
index 7a91322..0000000
--- a/src/views/business/subpackage/record/components/outsourcerAbility.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- 分包方业务能力 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerAbility } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerAbility>({
-  abilityDesc: '', // 能力描述
-  abilityName: '', // 能力名称
-  createTime: '', // 创建时间（列表返回参数）
-  id: '', //
-  outsourcerId: '', // 分包方id
-  price: '', // 报价
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '能力名称', value: 'abilityName', align: 'center', width: '160px' },
-  { text: '能力描述', value: 'abilityDesc', align: 'center' },
-  { text: '报价', value: 'price', align: 'center', width: '160px' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/outsourcerUser.vue b/src/views/business/subpackage/record/components/outsourcerUser.vue
deleted file mode 100644
index 4f9a310..0000000
--- a/src/views/business/subpackage/record/components/outsourcerUser.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- 分包方人员 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerUser } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerUser>({
-  createTime: '', // 创建时间（列表返回参数）
-  department: '', // 部门
-  id: '', //
-  job: '', // 职务
-  name: '', // 人员名字
-  outsourcerId: '', // 分包方id
-  phone: '', // 联系方式
-  userNo: '', // 人员编号-手动输入
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center', width: '160px' },
-  { text: '工作部门', value: 'department', align: 'center' },
-  { text: '职务', value: 'job', align: 'center', width: '160px' },
-  { text: '联系方式', value: 'phone', align: 'center' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/templateTable.vue b/src/views/business/subpackage/record/components/templateTable.vue
index 51c05f1..82acc77 100644
--- a/src/views/business/subpackage/record/components/templateTable.vue
+++ b/src/views/business/subpackage/record/components/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
@@ -20,12 +20,20 @@
     type: Number,
     default: 0,
   },
+  pagination: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['changePage'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
 })
+watch(() => props.columns, () => {
+  console.log(searchQuery.value)
+  searchQuery.value.offset = 1
+})
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -44,6 +52,7 @@
       :data="list" :total="total" :columns="columns"
       :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
       :list-loading="loading"
+      :pagination="pagination"
       @change="changePage"
     />
   </div>

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index af4ff99..42da39b 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -17,7 +17,6 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const approvalDialog = ref() // 审批对话ref
-
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -101,10 +100,10 @@
   }
   // 模拟数据
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item) => {
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCountryName + item.addressCityName + item.addressAreaName + item.fullAddress : item.addressCountryName + item.addressProvinceName + item.addressCityName + item.addressAreaName + item.fullAddress,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
@@ -116,7 +115,16 @@
 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 clearList = () => {
   listQuery.value = {
diff --git a/src/views/business/subpackage/record/components/addRow.vue b/src/views/business/subpackage/record/components/addRow.vue
deleted file mode 100644
index 07b03d1..0000000
--- a/src/views/business/subpackage/record/components/addRow.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '110px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '周检记录',
-    form: {
-
-    },
-  },
-  {
-    name: '状态变更记录',
-    form: {
-
-    },
-  },
-  {
-    name: '使用记录',
-    form: {
-
-    },
-  },
-  {
-    name: '检定证书',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '周检记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="检定日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="有效日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="送检人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '状态变更记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
-                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="申请人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '使用记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '检定证书'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书出具日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书有效期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/business/subpackage/record/components/outsourcerAbility.vue b/src/views/business/subpackage/record/components/outsourcerAbility.vue
deleted file mode 100644
index 7a91322..0000000
--- a/src/views/business/subpackage/record/components/outsourcerAbility.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- 分包方业务能力 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerAbility } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerAbility>({
-  abilityDesc: '', // 能力描述
-  abilityName: '', // 能力名称
-  createTime: '', // 创建时间（列表返回参数）
-  id: '', //
-  outsourcerId: '', // 分包方id
-  price: '', // 报价
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '能力名称', value: 'abilityName', align: 'center', width: '160px' },
-  { text: '能力描述', value: 'abilityDesc', align: 'center' },
-  { text: '报价', value: 'price', align: 'center', width: '160px' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/outsourcerUser.vue b/src/views/business/subpackage/record/components/outsourcerUser.vue
deleted file mode 100644
index 4f9a310..0000000
--- a/src/views/business/subpackage/record/components/outsourcerUser.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- 分包方人员 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerUser } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerUser>({
-  createTime: '', // 创建时间（列表返回参数）
-  department: '', // 部门
-  id: '', //
-  job: '', // 职务
-  name: '', // 人员名字
-  outsourcerId: '', // 分包方id
-  phone: '', // 联系方式
-  userNo: '', // 人员编号-手动输入
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center', width: '160px' },
-  { text: '工作部门', value: 'department', align: 'center' },
-  { text: '职务', value: 'job', align: 'center', width: '160px' },
-  { text: '联系方式', value: 'phone', align: 'center' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/templateTable.vue b/src/views/business/subpackage/record/components/templateTable.vue
index 51c05f1..82acc77 100644
--- a/src/views/business/subpackage/record/components/templateTable.vue
+++ b/src/views/business/subpackage/record/components/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
@@ -20,12 +20,20 @@
     type: Number,
     default: 0,
   },
+  pagination: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['changePage'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
 })
+watch(() => props.columns, () => {
+  console.log(searchQuery.value)
+  searchQuery.value.offset = 1
+})
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -44,6 +52,7 @@
       :data="list" :total="total" :columns="columns"
       :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
       :list-loading="loading"
+      :pagination="pagination"
       @change="changePage"
     />
   </div>
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 8ca3ed4..4559a80 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -1,447 +1,816 @@
-<!-- 分包方档案详情 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ref } from 'vue'
-import type { IRecordDetail } from '../subpackage-interface'
-import outsourcerUser from './components/outsourcerUser.vue'
-import outsourcerAbility from './components/outsourcerAbility.vue'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/record'
-import { fetchApproval, submitApproval } from '@/api/approval'
+<!-- 分包方资格审批详情 -->
+<script lang="ts" setup name="SubpackageApproveEdit">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { IAbility, IMenu, IMenuDetail, Iperson } from './record-interface'
+import TemplateTable from './components/templateTable.vue'
+import { isNumber, validatePhone } from '@/utils/validate'
+import type { CustomerPerson, ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import type { IForm, dictType } from '@/views/business/subpackage/approve/approve-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { UploadFile } from '@/api/measure/file'
 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'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('detail') // 页面类型: add, edit, detail
+const submitId = ref('') // 提交使用的id
+const approvalStatusName = ref('') // 审批状态名字
 const $route = useRoute()
-const $router = useRouter()
 const query = $route.query
-const menu = ref<IMenu[]>([
-  {
-    name: '分包方人员',
-    id: '0',
-  },
-  {
-    name: '业务能力',
-    id: '1',
-  },
-  {
-    name: '项目记录',
-    id: '2',
-  },
-  {
-    name: '合同记录',
-    id: '3',
-  },
-  {
-    name: '检定证书',
-    id: '4',
-  },
-])
-// 详情按钮组合
-// 当前点击
-const active = ref('')
-// 当前点击名称
-const currentMenuTitle = ref('')
-const detailForm = ref<IRecordDetail>({
-  addressArea: '', // 公司地址-区编码
-  addressAreaName: '', // 公司地址-区
-  addressCity: '', // 公司地址-市编码
-  addressCityName: '', // 公司地址-市
-  addressCountry: '', // 公司地址-国家编码
-  addressCountryName: '', // 公司地址-国家
-  addressProvince: '', // 公司地址-省编码
-  addressProvinceName: '', // 公司地址-省
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+
+// 表单
+const dataForm: Ref<IForm> = ref({
+  id: '',
+  businessContent: '', // 业务内容
+  outsourcerName: '', // 公司名称
+  outsourcerNo: '', // 分包方编号
   bankAccount: '', // 银行账户名
   bankAccountNumber: '', // 银行账号
   bankName: '', // 银行名称
-  businessContent: '', // 业务内容
+  outsourcerBriefName: '', // 公司简称
   businessScope: '', // 公司业务范围
+  grade: '', // 履约评级
+  outsourcerSize: '', // 公司规模
   businessSize: '', // 业务规模-字典code
-  businessSizeName: '', // 业务规模-字典value
-  createTime: '', // 创建时间（列表接口返回参数）
-  director: '', // 负责人
-  email: '', // 邮箱
-  evaluation: '', // 整体评价-字典code
-  evaluationName: '', // 整体评价-字典value
+  evaluation: '', // 整体评价
   fullAddress: '', // 公司地址-详细地址
-  grade: '', // 履约评级-字典code
-  gradeName: '', // 履约评级-字典value
-  id: '', // 主键id（列表、更新、详情接口参数）
-  invoiceArea: '', // 开票地址-区编码
-  invoiceAreaName: '', // 开票地址-区
-  invoiceCity: '', // 开票地址-市编码
-  invoiceCityName: '', // 开票地址-市
-  invoiceCountry: '', // 开票地址-国家编码
-  invoiceCountryName: '', // 开票地址-国家
+  addressArea: '', // 公司地址-区编码
+  addressCity: '', // 公司地址-市编码
+  addressCountry: '', // 公司地址-国家编码
+  addressProvince: '', // 公司地址-省编码
+  addressAreaName: '', // 公司地址-区
+  addressCityName: '', // 公司地址-市
+  addressCountryName: '', // 公司地址-国家
+  addressProvinceName: '', // 公司地址-省
+  director: '', // 负责人
+  // fax: '', // 传真
   invoiceFullAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区编码
+  invoiceCity: '', // 开票地址-市编码
+  invoiceCountry: '', // 开票地址-国家编码
   invoiceProvince: '', // 开票地址-省编码
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', // 开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
   invoiceProvinceName: '', // 开票地址-省
+  email: '', // 邮箱
   minioFileName: '', // minio存储文件名
   mobile: '', // 手机
-  outsourcerBriefName: '', // 公司简称
-  outsourcerName: '', // 公司名称
-  outsourcerNo: '', // 分包方编号
-  outsourcerSize: '', // 公司规模-字典code
-  outsourcerSizeName: '', // 公司规模-字典value
-  phone: '', // 电话
-  postalCode: '', // 邮编
-  processId: '', // 流程实例id（未通过编辑接口必传参数）
+  phone: '', // phone
+  postalCode: '', // postalCode
+  processId: '', // 流程实例id
   remark: '', // 备注
   taxNumber: '', // 税号
   website: '', // 网址
 })
+const fullAddress = ref<string[]>([]) // 公司地址
+const invoiceFullAddress = ref<string[]>([]) // 开票地址
+const ruleFormRef = ref<FormInstance>()
+// 初始化router
+const $router = useRouter()
 
-// 校验规则
-const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
-  outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
-  outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  website: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
-  preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
-  preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
-})
-
-const getDetail = () => {
-  detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
-    detailForm.value = res.data
+// -----------------------------------------路由参数--------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典-----------------------------------------
+const companySizeList = ref<dictType[]>([]) // 公司规模列表
+const businessSizeList = ref<dictType[]>([]) // 业务规模列表
+const gradeList = ref<dictType[]>([]) // 履约评级列表
+const evaluationList = ref<dictType[]>([]) // 整体评价列表
+function getDict() {
+  // 获取公司规模
+  getDictByCode('companySize').then((response) => {
+    companySizeList.value = response.data
+  })
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+  // 获取整体评价
+  getDictByCode('evaluation').then((response) => {
+    evaluationList.value = response.data
   })
 }
+// -----------------------------------------表格--------------------------------------
+const SelectionList = ref([]) // 表格选中
+const abilityList: Ref<IAbility[]> = ref([]) // 业务能力列表
+const personList: Ref<Iperson[]> = ref([]) // 人员列表
 
-// 关闭新增页面的回调
+// 其他关联数据列表
+const dataList = ref({
+  // personList: [] as Iperson[], // 人员列表
+  abilityList: [] as IAbility[], // 业务能力列表
+  projectRecords: [], // 项目记录
+  contractRecords: [], // 合同记录
+  certificationRecords: [], // 证书记录
+})
+
+const menuEdit = ref<IMenu[]>([
+  {
+    name: '分包方人员',
+    columns: [
+      { text: '编号', value: 'userNo', required: true },
+      { text: '姓名', value: 'name', required: true },
+      { text: '工作部门', value: 'department' },
+      { text: '职务', value: 'job' },
+      { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
+    ],
+    pagination: false,
+    list: 'personList',
+    searchFunc: null,
+  },
+  {
+    name: '业务能力',
+    columns: [
+      { text: '能力名称', value: 'abilityName', required: true },
+      { text: '能力描述', value: 'abilityDesc', required: true },
+      { text: '报价', value: 'price', required: true, reg: isNumber },
+    ],
+    pagination: false,
+    list: 'abilityList',
+    searchFunc: null,
+  },
+]) // 分包方人员和业务能力
+
+// 获取合同记录
+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: '项目记录',
+    columns: [
+      { text: '分包项目编号', value: 'projectNo' },
+      { text: '分包项目名称', value: 'projectName' },
+      { text: '申请人', value: 'applicantName' },
+      { text: '申请时间', value: 'applicantTime' },
+      { text: '验收状况', value: 'checkConclusion' },
+      { text: '验收时间', value: 'checkTime' },
+    ],
+    pagination: true,
+    list: 'projectRecords',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    searchFunc: null,
+  },
+  {
+    name: '合同记录',
+    columns: [
+      { text: '合同编号', value: 'contractCode' },
+      { text: '合同名称', value: 'contractName' },
+      { text: '合同金额', value: 'contractPrice' },
+      { text: '合同状态', value: 'contractStatus' },
+      { text: '合同时间', value: 'contractTime' },
+      { text: '负责人', value: 'aCompanyDutyman' },
+    ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    list: 'contractRecords',
+    pagination: true,
+    searchFunc: fetchContractRecords,
+  },
+  {
+    name: '检定证书',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+])
+const currentMenuEdit = ref('分包方人员')
+const currentMenuEditObj = computed(() => {
+  return menuEdit.value.find(item => item.name === currentMenuEdit.value)
+})
+const currentMenuDetail = ref('项目记录')
+const currentMenuDetailObj = computed(() => {
+  return menuDetail.value.find(item => item.name === currentMenuDetail.value)
+})
+
+// 人员对象
+const addPersonObj: Iperson = {
+  department: '', // 部门
+  job: '', // 职务
+  name: '', // 名字
+  outsourcerId: '', // 分包方id
+  phone: '', // 手机
+  userNo: '', // 人员编号
+  createTime: '', // 创建时间
+  id: '',
+  editable: true,
+}
+// 业务能力对象
+const addAbilityObj: IAbility = {
+  abilityDesc: '', // 能力描述
+  abilityName: '', // 能力名称
+  outsourcerId: '',
+  price: '', // 报价
+  createTime: '', // 创建时间
+  id: '',
+  editable: true,
+}
+
+// 检查列表
+function checkPersonList(list: any) {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of currentMenuEditObj.value!.columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
+
+// 将所有信息列表置为不可编辑状态
+function setAllRowReadable(list: any) {
+  for (const item of list) {
+    item.editable = false
+  }
+}
+// -----------------------------------------人员信息------------------------------------------
+
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (currentMenuEdit.value === '分包方人员') {
+    setAllRowReadable(personList.value)
+    row.editable = true
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    setAllRowReadable(abilityList.value)
+    row.editable = true
+  }
+}
+
+// 点击增加行
+const addRow = () => {
+  if (currentMenuEdit.value === '分包方人员') {
+    console.log('分包方人员增加')
+
+    // 检查上一行必填项
+    if (checkPersonList(personList.value)) {
+      setAllRowReadable(personList.value)
+      personList.value.push({ ...addPersonObj })
+    }
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    console.log('业务能力增加')
+
+    // 检查上一行必填项
+    if (checkPersonList(abilityList.value)) {
+      setAllRowReadable(abilityList.value)
+      abilityList.value.push({ ...addAbilityObj })
+    }
+  }
+}
+
+// 删除行
+const deleteList = () => {
+  if (currentMenuEdit.value === '分包方人员') {
+    personList.value = personList.value.filter((item: Iperson) => {
+      return !SelectionList.value.includes(item)
+    })
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    abilityList.value = abilityList.value.filter((item: IAbility) => {
+      return !SelectionList.value.includes(item)
+    })
+  }
+}
+// 表格选中
+const handleSelectionChange = (e: CustomerPerson[]) => {
+  SelectionList.value = e
+}
+// -----------------------------------------业务能力-------------------------------------------------
+
+// ---------------------------------------------------------------------------------------------------
+// 获取详情表单
+const getInfo = () => {
+  loading.value = true
+  detail({ id: infoId.value }).then((res) => {
+    loading.value = false
+    dataForm.value = res.data
+    if (pageType.value == 'detail') {
+      fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+    }
+    else {
+      fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+    }
+  })
+}
+// 关闭
 const close = () => {
   $router.back()
 }
-// 文件上传
-const fileRef = ref()
+// 公司地址变化后给对象赋值
+function fullAddressChange(addressObj: IAddress) {
+  dataForm.value.addressCountry = addressObj.country
+  dataForm.value.addressProvince = addressObj.province
+  dataForm.value.addressCity = addressObj.city
+  dataForm.value.addressArea = addressObj.area
+  dataForm.value.fullAddress = addressObj.address
+  dataForm.value.addressCountryName = addressObj.countryName
+  dataForm.value.addressProvinceName = addressObj.provinceName
+  dataForm.value.addressCityName = addressObj.cityName
+  dataForm.value.addressAreaName = addressObj.areaName
+}
+// 开票地址发生变化
+function invoiceFullAddressChange(addressObj: IAddress) {
+  dataForm.value.invoiceCountry = addressObj.country
+  dataForm.value.invoiceProvince = addressObj.province
+  dataForm.value.invoiceCity = addressObj.city
+  dataForm.value.invoiceArea = addressObj.area
+  dataForm.value.invoiceFullAddress = addressObj.address
+  dataForm.value.invoiceCountryName = addressObj.countryName
+  dataForm.value.invoiceProvinceName = addressObj.provinceName
+  dataForm.value.invoiceCityName = addressObj.cityName
+  dataForm.value.invoiceAreaName = addressObj.areaName
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '客户详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>分包方档案详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  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) => {
+          if (res.code === 200) {
+            submitId.value = res.data.id
+            loading.close()
+            ElMessage.success('保存成功')
+            close()
+          }
+        }).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()
+          })
+        }
+      }
+    }
+  })
+}
+// 提交
+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('请先保存！')
+  }
+}
+
+// -----------------------------------------文件上传-----------------------------------
+const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    detailForm.value.minioFileName = event.target.files[0].name
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
 }
 const upload = () => {
   fileRef.value.click()
 }
-
-// 公司地址变化后给对象赋值
-function fullAddressChange(addressObj: IAddress) {
-  // dataForm.value.addressCountry = addressObj.country
-  // dataForm.value.addressProvince = addressObj.province
-  // dataForm.value.addressCity = addressObj.city
-  // dataForm.value.addressArea = addressObj.area
-  // dataForm.value.fullAddress = addressObj.address
-  // dataForm.value.addressCountryName = addressObj.countryName
-  // dataForm.value.addressProvinceName = addressObj.provinceName
-  // dataForm.value.addressCityName = addressObj.cityName
-  // dataForm.value.addressAreaName = addressObj.areaName
-}
-// 开票地址发生变化
-function invoiceFullAddressChange(addressObj: IAddress) {
-  // dataForm.value.invoiceCountry = addressObj.country
-  // dataForm.value.invoiceProvince = addressObj.province
-  // dataForm.value.invoiceCity = addressObj.city
-  // dataForm.value.invoiceArea = addressObj.area
-  // dataForm.value.invoiceFullAddress = addressObj.address
-  // dataForm.value.invoiceCountryName = addressObj.countryName
-  // dataForm.value.invoiceProvinceName = addressObj.provinceName
-  // dataForm.value.invoiceCityName = addressObj.cityName
-  // dataForm.value.invoiceAreaName = addressObj.areaName
-}
-
-// 切换tab状态
-const changeCurrentButton = (val: string) => {
-  console.log(val)
-  active.value = val
-  currentMenuTitle.value = menu.value.filter((item) => {
-    return item.id === val
-  })[0].name
-}
+// -------------------------------------------审批流程----------------------------------------
 
 onMounted(() => {
-  if (query.title !== '新建') {
-    getDetail()
+  approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
+  dataForm.value.processId = query.processId as string // 流程实例id
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
   }
-  active.value = '0'
+  getDict()
 })
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
-    <detail-page title="分包方档案">
+  <app-container>
+    <detail-page v-loading="loading" :title="`分包方档案-${textMap[pageType]}`">
       <template #btns>
-        <el-button type="primary">
+        <!-- <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 type="primary">
-          编辑/保存
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
-      <!-- 基本信息 -->
-      <el-form
-        ref="ruleFormRef"
-        :model="detailForm"
-        :label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerNo">
-              <el-input
-                v-model="detailForm.outsourcerNo" disabled
-              />
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="分包方编号:" prop="outsourcerNo">
+                <el-input
+                  v-model="dataForm.outsourcerNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="公司名称:" prop="outsourcerName">
+                <el-input
+                  v-model.trim="dataForm.outsourcerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入公司名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="公司简称:">
+                <el-input
+                  v-model="dataForm.outsourcerBriefName"
+                  :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="businessContent">
+                <el-input
+                  v-model.trim="dataForm.businessContent"
+                  :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="outsourcerSize">
+                <el-select v-model="dataForm.outsourcerSize" :placeholder="pageType === 'detail' ? ' ' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in companySizeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务规模" prop="businessSize">
+                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? ' ' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="履约评级" prop="grade">
+                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? ' ' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="整体评价" prop="evaluation">
+                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? ' ' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in evaluationList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="税号:" prop="taxNumber">
+                <el-input
+                  v-model="dataForm.taxNumber"
+                  :placeholder="pageType === 'detail' ? '' : '请输入税号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行账户名:">
+                <el-input
+                  v-model="dataForm.bankAccount"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行账户名'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行名称:">
+                <el-input
+                  v-model="dataForm.bankName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行账号:">
+                <el-input
+                  v-model="dataForm.bankAccountNumber"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行账号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮编:">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入邮编'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="负责人:">
+                <el-input
+                  v-model="dataForm.director"
+                  :placeholder="pageType === 'detail' ? '' : '请输入负责人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电话:">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="6">
+              <el-form-item label="传真:">
+                <el-input
+                  v-model="dataForm.fax"
+                  :placeholder="pageType === 'detail' ? '' : '请输入传真'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="6">
+              <el-form-item label="手机:">
+                <el-input
+                  v-model="dataForm.mobile"
+                  :placeholder="pageType === 'detail' ? '' : '请输入手机'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮箱:">
+                <el-input
+                  v-model="dataForm.email"
+                  :placeholder="pageType === 'detail' ? '' : '请输入邮箱'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="网址:">
+                <el-input
+                  v-model="dataForm.website"
+                  :placeholder="pageType === 'detail' ? '' : '请输入网址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="5">
+            <el-form-item label="公司地址:">
+              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="outsourcerName">
-              <el-input
-                v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
-              />
+          </el-row>
+          <el-row :gutter="5">
+            <el-form-item label="开票地址:">
+              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司简称:" prop="outsourcerBriefName">
-              <el-input
-                v-model="detailForm.outsourcerBriefName" disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="detailForm.businessContent" disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司规模:" prop="outsourcerSize">
-              <el-input
-                v-model="detailForm.outsourcerSize"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务规模:" prop="businessSize">
-              <el-input
-                v-model="detailForm.businessSize"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="履约评级:" prop="grade">
-              <el-input
-                v-model="detailForm.grade"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="整体评价:" prop="evaluation">
-              <el-input
-                v-model="detailForm.evaluation"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="detailForm.taxNumber"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:" prop="bankAccount">
-              <el-input
-                v-model="detailForm.bankAccount"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:" prop="bankName">
-              <el-input
-                v-model="detailForm.bankName"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:" prop="bankAccountNumber">
-              <el-input
-                v-model="detailForm.bankAccountNumber"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:" prop="postalCode">
-              <el-input
-                v-model="detailForm.postalCode"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="detailForm.director"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:" prop="phone">
-              <el-input
-                v-model="detailForm.phone"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:" prop="website">
-              <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:" prop="mobile">
-              <el-input
-                v-model="detailForm.mobile"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:" prop="email">
-              <el-input
-                v-model="detailForm.email"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:" prop="website">
-              <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="公司地址:" prop="website">
-              <!-- todo -->
-              <!-- <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              /> -->
-              <address-select :data="[]" :detail="query.title === '详情'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="开票用地址:" prop="website">
-              <!-- todo -->
-              <!-- <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              /> -->
-              <address-select :data="[]" :detail="query.title === '详情'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:" prop="businessScope">
-              <el-input
-                v-model="detailForm.businessScope"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="detailForm.remark"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" />
-          <el-col :span="6">
-            <el-form-item label="附件:" prop="minioFileName">
-              <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
-              <span v-if="query.title === '详情' && !detailForm.minioFileName">无</span>
-              <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.minioFileName || ''" style="display: inline-block;" />
-              </div>
-              <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
-                {{ detailForm.minioFileName ? '更换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-          <el-col :span="18" />
-        </el-row>
-      </el-form>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="14">
+              <el-form-item label="公司业务范围:">
+                <el-input
+                  v-model="dataForm.businessScope"
+                  :placeholder="pageType === 'detail' ? '' : '请输入公司业务范围'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="14">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </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.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <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.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </detail-page>
-    <detail-block :title="currentMenuTitle">
-      <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
-    </detail-block>
-    <template
-      #btns
-    >
-      <el-button type="primary">
-        增加行
-      </el-button>
-      <el-button type="info">
-        删除行
-      </el-button>
-    </template>
-    <outsourcer-user v-if="active === '1'" />
-    <outsourcer-ability v-if="active === '2'" />
-    <!-- 分包方人员 -->
-    <!-- 业务能力 -->
-    <!-- 项目记录 -->
-    <!-- 合同记录 -->
-    <!-- 检定证书 -->
+
+    <detail-block-switch :title="currentMenuEdit">
+      <template #menu>
+        <el-radio-group v-model="currentMenuEdit">
+          <el-radio-button v-for="item in menuEdit" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        v-loading="loading"
+        :data="currentMenuEdit === '分包方人员' ? personList : abilityList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in currentMenuEditObj!.columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block-switch>
+    <detail-block-switch :title="currentMenuDetail">
+      <template #menu>
+        <el-radio-group v-model="currentMenuDetail">
+          <el-radio-button v-for="item in menuDetail" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </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" />
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-::v-deep.container .btns {
-  position: static !important;
-}
 </style>
+

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index af4ff99..42da39b 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -17,7 +17,6 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const approvalDialog = ref() // 审批对话ref
-
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -101,10 +100,10 @@
   }
   // 模拟数据
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item) => {
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCountryName + item.addressCityName + item.addressAreaName + item.fullAddress : item.addressCountryName + item.addressProvinceName + item.addressCityName + item.addressAreaName + item.fullAddress,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
@@ -116,7 +115,16 @@
 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 clearList = () => {
   listQuery.value = {
diff --git a/src/views/business/subpackage/record/components/addRow.vue b/src/views/business/subpackage/record/components/addRow.vue
deleted file mode 100644
index 07b03d1..0000000
--- a/src/views/business/subpackage/record/components/addRow.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '110px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '周检记录',
-    form: {
-
-    },
-  },
-  {
-    name: '状态变更记录',
-    form: {
-
-    },
-  },
-  {
-    name: '使用记录',
-    form: {
-
-    },
-  },
-  {
-    name: '检定证书',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '周检记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="检定日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="有效日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="送检人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '状态变更记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
-                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="申请人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '使用记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '检定证书'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书出具日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书有效期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/business/subpackage/record/components/outsourcerAbility.vue b/src/views/business/subpackage/record/components/outsourcerAbility.vue
deleted file mode 100644
index 7a91322..0000000
--- a/src/views/business/subpackage/record/components/outsourcerAbility.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- 分包方业务能力 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerAbility } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerAbility>({
-  abilityDesc: '', // 能力描述
-  abilityName: '', // 能力名称
-  createTime: '', // 创建时间（列表返回参数）
-  id: '', //
-  outsourcerId: '', // 分包方id
-  price: '', // 报价
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '能力名称', value: 'abilityName', align: 'center', width: '160px' },
-  { text: '能力描述', value: 'abilityDesc', align: 'center' },
-  { text: '报价', value: 'price', align: 'center', width: '160px' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/outsourcerUser.vue b/src/views/business/subpackage/record/components/outsourcerUser.vue
deleted file mode 100644
index 4f9a310..0000000
--- a/src/views/business/subpackage/record/components/outsourcerUser.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- 分包方人员 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerUser } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerUser>({
-  createTime: '', // 创建时间（列表返回参数）
-  department: '', // 部门
-  id: '', //
-  job: '', // 职务
-  name: '', // 人员名字
-  outsourcerId: '', // 分包方id
-  phone: '', // 联系方式
-  userNo: '', // 人员编号-手动输入
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center', width: '160px' },
-  { text: '工作部门', value: 'department', align: 'center' },
-  { text: '职务', value: 'job', align: 'center', width: '160px' },
-  { text: '联系方式', value: 'phone', align: 'center' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/templateTable.vue b/src/views/business/subpackage/record/components/templateTable.vue
index 51c05f1..82acc77 100644
--- a/src/views/business/subpackage/record/components/templateTable.vue
+++ b/src/views/business/subpackage/record/components/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
@@ -20,12 +20,20 @@
     type: Number,
     default: 0,
   },
+  pagination: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['changePage'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
 })
+watch(() => props.columns, () => {
+  console.log(searchQuery.value)
+  searchQuery.value.offset = 1
+})
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -44,6 +52,7 @@
       :data="list" :total="total" :columns="columns"
       :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
       :list-loading="loading"
+      :pagination="pagination"
       @change="changePage"
     />
   </div>
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 8ca3ed4..4559a80 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -1,447 +1,816 @@
-<!-- 分包方档案详情 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ref } from 'vue'
-import type { IRecordDetail } from '../subpackage-interface'
-import outsourcerUser from './components/outsourcerUser.vue'
-import outsourcerAbility from './components/outsourcerAbility.vue'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/record'
-import { fetchApproval, submitApproval } from '@/api/approval'
+<!-- 分包方资格审批详情 -->
+<script lang="ts" setup name="SubpackageApproveEdit">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { IAbility, IMenu, IMenuDetail, Iperson } from './record-interface'
+import TemplateTable from './components/templateTable.vue'
+import { isNumber, validatePhone } from '@/utils/validate'
+import type { CustomerPerson, ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import type { IForm, dictType } from '@/views/business/subpackage/approve/approve-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { UploadFile } from '@/api/measure/file'
 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'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('detail') // 页面类型: add, edit, detail
+const submitId = ref('') // 提交使用的id
+const approvalStatusName = ref('') // 审批状态名字
 const $route = useRoute()
-const $router = useRouter()
 const query = $route.query
-const menu = ref<IMenu[]>([
-  {
-    name: '分包方人员',
-    id: '0',
-  },
-  {
-    name: '业务能力',
-    id: '1',
-  },
-  {
-    name: '项目记录',
-    id: '2',
-  },
-  {
-    name: '合同记录',
-    id: '3',
-  },
-  {
-    name: '检定证书',
-    id: '4',
-  },
-])
-// 详情按钮组合
-// 当前点击
-const active = ref('')
-// 当前点击名称
-const currentMenuTitle = ref('')
-const detailForm = ref<IRecordDetail>({
-  addressArea: '', // 公司地址-区编码
-  addressAreaName: '', // 公司地址-区
-  addressCity: '', // 公司地址-市编码
-  addressCityName: '', // 公司地址-市
-  addressCountry: '', // 公司地址-国家编码
-  addressCountryName: '', // 公司地址-国家
-  addressProvince: '', // 公司地址-省编码
-  addressProvinceName: '', // 公司地址-省
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+
+// 表单
+const dataForm: Ref<IForm> = ref({
+  id: '',
+  businessContent: '', // 业务内容
+  outsourcerName: '', // 公司名称
+  outsourcerNo: '', // 分包方编号
   bankAccount: '', // 银行账户名
   bankAccountNumber: '', // 银行账号
   bankName: '', // 银行名称
-  businessContent: '', // 业务内容
+  outsourcerBriefName: '', // 公司简称
   businessScope: '', // 公司业务范围
+  grade: '', // 履约评级
+  outsourcerSize: '', // 公司规模
   businessSize: '', // 业务规模-字典code
-  businessSizeName: '', // 业务规模-字典value
-  createTime: '', // 创建时间（列表接口返回参数）
-  director: '', // 负责人
-  email: '', // 邮箱
-  evaluation: '', // 整体评价-字典code
-  evaluationName: '', // 整体评价-字典value
+  evaluation: '', // 整体评价
   fullAddress: '', // 公司地址-详细地址
-  grade: '', // 履约评级-字典code
-  gradeName: '', // 履约评级-字典value
-  id: '', // 主键id（列表、更新、详情接口参数）
-  invoiceArea: '', // 开票地址-区编码
-  invoiceAreaName: '', // 开票地址-区
-  invoiceCity: '', // 开票地址-市编码
-  invoiceCityName: '', // 开票地址-市
-  invoiceCountry: '', // 开票地址-国家编码
-  invoiceCountryName: '', // 开票地址-国家
+  addressArea: '', // 公司地址-区编码
+  addressCity: '', // 公司地址-市编码
+  addressCountry: '', // 公司地址-国家编码
+  addressProvince: '', // 公司地址-省编码
+  addressAreaName: '', // 公司地址-区
+  addressCityName: '', // 公司地址-市
+  addressCountryName: '', // 公司地址-国家
+  addressProvinceName: '', // 公司地址-省
+  director: '', // 负责人
+  // fax: '', // 传真
   invoiceFullAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区编码
+  invoiceCity: '', // 开票地址-市编码
+  invoiceCountry: '', // 开票地址-国家编码
   invoiceProvince: '', // 开票地址-省编码
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', // 开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
   invoiceProvinceName: '', // 开票地址-省
+  email: '', // 邮箱
   minioFileName: '', // minio存储文件名
   mobile: '', // 手机
-  outsourcerBriefName: '', // 公司简称
-  outsourcerName: '', // 公司名称
-  outsourcerNo: '', // 分包方编号
-  outsourcerSize: '', // 公司规模-字典code
-  outsourcerSizeName: '', // 公司规模-字典value
-  phone: '', // 电话
-  postalCode: '', // 邮编
-  processId: '', // 流程实例id（未通过编辑接口必传参数）
+  phone: '', // phone
+  postalCode: '', // postalCode
+  processId: '', // 流程实例id
   remark: '', // 备注
   taxNumber: '', // 税号
   website: '', // 网址
 })
+const fullAddress = ref<string[]>([]) // 公司地址
+const invoiceFullAddress = ref<string[]>([]) // 开票地址
+const ruleFormRef = ref<FormInstance>()
+// 初始化router
+const $router = useRouter()
 
-// 校验规则
-const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
-  outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
-  outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  website: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
-  preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
-  preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
-})
-
-const getDetail = () => {
-  detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
-    detailForm.value = res.data
+// -----------------------------------------路由参数--------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典-----------------------------------------
+const companySizeList = ref<dictType[]>([]) // 公司规模列表
+const businessSizeList = ref<dictType[]>([]) // 业务规模列表
+const gradeList = ref<dictType[]>([]) // 履约评级列表
+const evaluationList = ref<dictType[]>([]) // 整体评价列表
+function getDict() {
+  // 获取公司规模
+  getDictByCode('companySize').then((response) => {
+    companySizeList.value = response.data
+  })
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+  // 获取整体评价
+  getDictByCode('evaluation').then((response) => {
+    evaluationList.value = response.data
   })
 }
+// -----------------------------------------表格--------------------------------------
+const SelectionList = ref([]) // 表格选中
+const abilityList: Ref<IAbility[]> = ref([]) // 业务能力列表
+const personList: Ref<Iperson[]> = ref([]) // 人员列表
 
-// 关闭新增页面的回调
+// 其他关联数据列表
+const dataList = ref({
+  // personList: [] as Iperson[], // 人员列表
+  abilityList: [] as IAbility[], // 业务能力列表
+  projectRecords: [], // 项目记录
+  contractRecords: [], // 合同记录
+  certificationRecords: [], // 证书记录
+})
+
+const menuEdit = ref<IMenu[]>([
+  {
+    name: '分包方人员',
+    columns: [
+      { text: '编号', value: 'userNo', required: true },
+      { text: '姓名', value: 'name', required: true },
+      { text: '工作部门', value: 'department' },
+      { text: '职务', value: 'job' },
+      { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
+    ],
+    pagination: false,
+    list: 'personList',
+    searchFunc: null,
+  },
+  {
+    name: '业务能力',
+    columns: [
+      { text: '能力名称', value: 'abilityName', required: true },
+      { text: '能力描述', value: 'abilityDesc', required: true },
+      { text: '报价', value: 'price', required: true, reg: isNumber },
+    ],
+    pagination: false,
+    list: 'abilityList',
+    searchFunc: null,
+  },
+]) // 分包方人员和业务能力
+
+// 获取合同记录
+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: '项目记录',
+    columns: [
+      { text: '分包项目编号', value: 'projectNo' },
+      { text: '分包项目名称', value: 'projectName' },
+      { text: '申请人', value: 'applicantName' },
+      { text: '申请时间', value: 'applicantTime' },
+      { text: '验收状况', value: 'checkConclusion' },
+      { text: '验收时间', value: 'checkTime' },
+    ],
+    pagination: true,
+    list: 'projectRecords',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    searchFunc: null,
+  },
+  {
+    name: '合同记录',
+    columns: [
+      { text: '合同编号', value: 'contractCode' },
+      { text: '合同名称', value: 'contractName' },
+      { text: '合同金额', value: 'contractPrice' },
+      { text: '合同状态', value: 'contractStatus' },
+      { text: '合同时间', value: 'contractTime' },
+      { text: '负责人', value: 'aCompanyDutyman' },
+    ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    list: 'contractRecords',
+    pagination: true,
+    searchFunc: fetchContractRecords,
+  },
+  {
+    name: '检定证书',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+])
+const currentMenuEdit = ref('分包方人员')
+const currentMenuEditObj = computed(() => {
+  return menuEdit.value.find(item => item.name === currentMenuEdit.value)
+})
+const currentMenuDetail = ref('项目记录')
+const currentMenuDetailObj = computed(() => {
+  return menuDetail.value.find(item => item.name === currentMenuDetail.value)
+})
+
+// 人员对象
+const addPersonObj: Iperson = {
+  department: '', // 部门
+  job: '', // 职务
+  name: '', // 名字
+  outsourcerId: '', // 分包方id
+  phone: '', // 手机
+  userNo: '', // 人员编号
+  createTime: '', // 创建时间
+  id: '',
+  editable: true,
+}
+// 业务能力对象
+const addAbilityObj: IAbility = {
+  abilityDesc: '', // 能力描述
+  abilityName: '', // 能力名称
+  outsourcerId: '',
+  price: '', // 报价
+  createTime: '', // 创建时间
+  id: '',
+  editable: true,
+}
+
+// 检查列表
+function checkPersonList(list: any) {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of currentMenuEditObj.value!.columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
+
+// 将所有信息列表置为不可编辑状态
+function setAllRowReadable(list: any) {
+  for (const item of list) {
+    item.editable = false
+  }
+}
+// -----------------------------------------人员信息------------------------------------------
+
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (currentMenuEdit.value === '分包方人员') {
+    setAllRowReadable(personList.value)
+    row.editable = true
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    setAllRowReadable(abilityList.value)
+    row.editable = true
+  }
+}
+
+// 点击增加行
+const addRow = () => {
+  if (currentMenuEdit.value === '分包方人员') {
+    console.log('分包方人员增加')
+
+    // 检查上一行必填项
+    if (checkPersonList(personList.value)) {
+      setAllRowReadable(personList.value)
+      personList.value.push({ ...addPersonObj })
+    }
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    console.log('业务能力增加')
+
+    // 检查上一行必填项
+    if (checkPersonList(abilityList.value)) {
+      setAllRowReadable(abilityList.value)
+      abilityList.value.push({ ...addAbilityObj })
+    }
+  }
+}
+
+// 删除行
+const deleteList = () => {
+  if (currentMenuEdit.value === '分包方人员') {
+    personList.value = personList.value.filter((item: Iperson) => {
+      return !SelectionList.value.includes(item)
+    })
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    abilityList.value = abilityList.value.filter((item: IAbility) => {
+      return !SelectionList.value.includes(item)
+    })
+  }
+}
+// 表格选中
+const handleSelectionChange = (e: CustomerPerson[]) => {
+  SelectionList.value = e
+}
+// -----------------------------------------业务能力-------------------------------------------------
+
+// ---------------------------------------------------------------------------------------------------
+// 获取详情表单
+const getInfo = () => {
+  loading.value = true
+  detail({ id: infoId.value }).then((res) => {
+    loading.value = false
+    dataForm.value = res.data
+    if (pageType.value == 'detail') {
+      fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+    }
+    else {
+      fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+    }
+  })
+}
+// 关闭
 const close = () => {
   $router.back()
 }
-// 文件上传
-const fileRef = ref()
+// 公司地址变化后给对象赋值
+function fullAddressChange(addressObj: IAddress) {
+  dataForm.value.addressCountry = addressObj.country
+  dataForm.value.addressProvince = addressObj.province
+  dataForm.value.addressCity = addressObj.city
+  dataForm.value.addressArea = addressObj.area
+  dataForm.value.fullAddress = addressObj.address
+  dataForm.value.addressCountryName = addressObj.countryName
+  dataForm.value.addressProvinceName = addressObj.provinceName
+  dataForm.value.addressCityName = addressObj.cityName
+  dataForm.value.addressAreaName = addressObj.areaName
+}
+// 开票地址发生变化
+function invoiceFullAddressChange(addressObj: IAddress) {
+  dataForm.value.invoiceCountry = addressObj.country
+  dataForm.value.invoiceProvince = addressObj.province
+  dataForm.value.invoiceCity = addressObj.city
+  dataForm.value.invoiceArea = addressObj.area
+  dataForm.value.invoiceFullAddress = addressObj.address
+  dataForm.value.invoiceCountryName = addressObj.countryName
+  dataForm.value.invoiceProvinceName = addressObj.provinceName
+  dataForm.value.invoiceCityName = addressObj.cityName
+  dataForm.value.invoiceAreaName = addressObj.areaName
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '客户详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>分包方档案详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  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) => {
+          if (res.code === 200) {
+            submitId.value = res.data.id
+            loading.close()
+            ElMessage.success('保存成功')
+            close()
+          }
+        }).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()
+          })
+        }
+      }
+    }
+  })
+}
+// 提交
+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('请先保存！')
+  }
+}
+
+// -----------------------------------------文件上传-----------------------------------
+const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    detailForm.value.minioFileName = event.target.files[0].name
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
 }
 const upload = () => {
   fileRef.value.click()
 }
-
-// 公司地址变化后给对象赋值
-function fullAddressChange(addressObj: IAddress) {
-  // dataForm.value.addressCountry = addressObj.country
-  // dataForm.value.addressProvince = addressObj.province
-  // dataForm.value.addressCity = addressObj.city
-  // dataForm.value.addressArea = addressObj.area
-  // dataForm.value.fullAddress = addressObj.address
-  // dataForm.value.addressCountryName = addressObj.countryName
-  // dataForm.value.addressProvinceName = addressObj.provinceName
-  // dataForm.value.addressCityName = addressObj.cityName
-  // dataForm.value.addressAreaName = addressObj.areaName
-}
-// 开票地址发生变化
-function invoiceFullAddressChange(addressObj: IAddress) {
-  // dataForm.value.invoiceCountry = addressObj.country
-  // dataForm.value.invoiceProvince = addressObj.province
-  // dataForm.value.invoiceCity = addressObj.city
-  // dataForm.value.invoiceArea = addressObj.area
-  // dataForm.value.invoiceFullAddress = addressObj.address
-  // dataForm.value.invoiceCountryName = addressObj.countryName
-  // dataForm.value.invoiceProvinceName = addressObj.provinceName
-  // dataForm.value.invoiceCityName = addressObj.cityName
-  // dataForm.value.invoiceAreaName = addressObj.areaName
-}
-
-// 切换tab状态
-const changeCurrentButton = (val: string) => {
-  console.log(val)
-  active.value = val
-  currentMenuTitle.value = menu.value.filter((item) => {
-    return item.id === val
-  })[0].name
-}
+// -------------------------------------------审批流程----------------------------------------
 
 onMounted(() => {
-  if (query.title !== '新建') {
-    getDetail()
+  approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
+  dataForm.value.processId = query.processId as string // 流程实例id
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
   }
-  active.value = '0'
+  getDict()
 })
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
-    <detail-page title="分包方档案">
+  <app-container>
+    <detail-page v-loading="loading" :title="`分包方档案-${textMap[pageType]}`">
       <template #btns>
-        <el-button type="primary">
+        <!-- <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 type="primary">
-          编辑/保存
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
-      <!-- 基本信息 -->
-      <el-form
-        ref="ruleFormRef"
-        :model="detailForm"
-        :label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerNo">
-              <el-input
-                v-model="detailForm.outsourcerNo" disabled
-              />
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="分包方编号:" prop="outsourcerNo">
+                <el-input
+                  v-model="dataForm.outsourcerNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="公司名称:" prop="outsourcerName">
+                <el-input
+                  v-model.trim="dataForm.outsourcerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入公司名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="公司简称:">
+                <el-input
+                  v-model="dataForm.outsourcerBriefName"
+                  :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="businessContent">
+                <el-input
+                  v-model.trim="dataForm.businessContent"
+                  :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="outsourcerSize">
+                <el-select v-model="dataForm.outsourcerSize" :placeholder="pageType === 'detail' ? ' ' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in companySizeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务规模" prop="businessSize">
+                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? ' ' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="履约评级" prop="grade">
+                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? ' ' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="整体评价" prop="evaluation">
+                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? ' ' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in evaluationList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="税号:" prop="taxNumber">
+                <el-input
+                  v-model="dataForm.taxNumber"
+                  :placeholder="pageType === 'detail' ? '' : '请输入税号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行账户名:">
+                <el-input
+                  v-model="dataForm.bankAccount"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行账户名'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行名称:">
+                <el-input
+                  v-model="dataForm.bankName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行账号:">
+                <el-input
+                  v-model="dataForm.bankAccountNumber"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行账号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮编:">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入邮编'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="负责人:">
+                <el-input
+                  v-model="dataForm.director"
+                  :placeholder="pageType === 'detail' ? '' : '请输入负责人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电话:">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="6">
+              <el-form-item label="传真:">
+                <el-input
+                  v-model="dataForm.fax"
+                  :placeholder="pageType === 'detail' ? '' : '请输入传真'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="6">
+              <el-form-item label="手机:">
+                <el-input
+                  v-model="dataForm.mobile"
+                  :placeholder="pageType === 'detail' ? '' : '请输入手机'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮箱:">
+                <el-input
+                  v-model="dataForm.email"
+                  :placeholder="pageType === 'detail' ? '' : '请输入邮箱'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="网址:">
+                <el-input
+                  v-model="dataForm.website"
+                  :placeholder="pageType === 'detail' ? '' : '请输入网址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="5">
+            <el-form-item label="公司地址:">
+              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="outsourcerName">
-              <el-input
-                v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
-              />
+          </el-row>
+          <el-row :gutter="5">
+            <el-form-item label="开票地址:">
+              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司简称:" prop="outsourcerBriefName">
-              <el-input
-                v-model="detailForm.outsourcerBriefName" disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="detailForm.businessContent" disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司规模:" prop="outsourcerSize">
-              <el-input
-                v-model="detailForm.outsourcerSize"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务规模:" prop="businessSize">
-              <el-input
-                v-model="detailForm.businessSize"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="履约评级:" prop="grade">
-              <el-input
-                v-model="detailForm.grade"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="整体评价:" prop="evaluation">
-              <el-input
-                v-model="detailForm.evaluation"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="detailForm.taxNumber"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:" prop="bankAccount">
-              <el-input
-                v-model="detailForm.bankAccount"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:" prop="bankName">
-              <el-input
-                v-model="detailForm.bankName"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:" prop="bankAccountNumber">
-              <el-input
-                v-model="detailForm.bankAccountNumber"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:" prop="postalCode">
-              <el-input
-                v-model="detailForm.postalCode"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="detailForm.director"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:" prop="phone">
-              <el-input
-                v-model="detailForm.phone"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:" prop="website">
-              <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:" prop="mobile">
-              <el-input
-                v-model="detailForm.mobile"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:" prop="email">
-              <el-input
-                v-model="detailForm.email"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:" prop="website">
-              <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="公司地址:" prop="website">
-              <!-- todo -->
-              <!-- <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              /> -->
-              <address-select :data="[]" :detail="query.title === '详情'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="开票用地址:" prop="website">
-              <!-- todo -->
-              <!-- <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              /> -->
-              <address-select :data="[]" :detail="query.title === '详情'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:" prop="businessScope">
-              <el-input
-                v-model="detailForm.businessScope"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="detailForm.remark"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" />
-          <el-col :span="6">
-            <el-form-item label="附件:" prop="minioFileName">
-              <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
-              <span v-if="query.title === '详情' && !detailForm.minioFileName">无</span>
-              <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.minioFileName || ''" style="display: inline-block;" />
-              </div>
-              <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
-                {{ detailForm.minioFileName ? '更换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-          <el-col :span="18" />
-        </el-row>
-      </el-form>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="14">
+              <el-form-item label="公司业务范围:">
+                <el-input
+                  v-model="dataForm.businessScope"
+                  :placeholder="pageType === 'detail' ? '' : '请输入公司业务范围'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="14">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </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.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <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.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </detail-page>
-    <detail-block :title="currentMenuTitle">
-      <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
-    </detail-block>
-    <template
-      #btns
-    >
-      <el-button type="primary">
-        增加行
-      </el-button>
-      <el-button type="info">
-        删除行
-      </el-button>
-    </template>
-    <outsourcer-user v-if="active === '1'" />
-    <outsourcer-ability v-if="active === '2'" />
-    <!-- 分包方人员 -->
-    <!-- 业务能力 -->
-    <!-- 项目记录 -->
-    <!-- 合同记录 -->
-    <!-- 检定证书 -->
+
+    <detail-block-switch :title="currentMenuEdit">
+      <template #menu>
+        <el-radio-group v-model="currentMenuEdit">
+          <el-radio-button v-for="item in menuEdit" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        v-loading="loading"
+        :data="currentMenuEdit === '分包方人员' ? personList : abilityList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in currentMenuEditObj!.columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block-switch>
+    <detail-block-switch :title="currentMenuDetail">
+      <template #menu>
+        <el-radio-group v-model="currentMenuDetail">
+          <el-radio-button v-for="item in menuDetail" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </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" />
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-::v-deep.container .btns {
-  position: static !important;
-}
 </style>
+
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0263347..657800b 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -1,42 +1,58 @@
 <!-- 分包方档案列表 -->
-<script lang="ts" setup name="record">
+<script lang="ts" setup name="subpackageRecordList">
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
-import type { DateModelType } from 'element-plus'
-import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery } from './record-interface'
+import type { IList } from '@/views/business/subpackage/approve/approve-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getListPage } from '@/api/business/subpackage/record'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import { exportRecordList, getListPage } from '@/api/business/subpackage/record'
 import { SCHEDULE } from '@/utils/scheduleDict'
-const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const loadingTable = ref(false)
+const $router = useRouter()
 // 查询条件
-const listQuery: Ref<IListQueryRecord> = ref({
-  businessSize: '', // 业务规模-字典code
+const listQuery: Ref<IListQuery> = ref({
   formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  outsourcerName: '', // 	公司名称
+  businessSize: '', //	业务规模-字典code
   grade: '', // 	履约评级-字典code
-  ids: [],
-  outsourcerName: '', // 分包方公司名字
-  outsourcerNo: '', // 编号
+  outsourcerNo: '', // 	分包方编号
   offset: 1,
   limit: 20,
 })
-const loadingTable = ref(false)
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包方编号', value: 'outsourcerNo', align: 'center', width: '160px' },
   { text: '公司名称', value: 'outsourcerName', align: 'center' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center' },
-  { text: '业务规模', value: 'businessSizeName', align: 'center' },
-  { text: '履约评级', value: 'gradeName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center', width: '110' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center', width: '130' },
+  { text: '履约评级', value: 'gradeName', align: 'center', width: '90' },
+  { text: '整体评价', value: 'evaluationName', align: 'center', width: '110' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
-const list = ref([])
-const total = ref(0)
+const list = ref<IList[]>([]) // 表格数据
+const total = ref(0) // 数据总条数
+const checkoutList = ref<string[]>([]) // 选中的内容
+const businessSizeList = ref<dictType[]>([]) // 业务规模列表
+const gradeList = ref<dictType[]>([]) // 履约评级列表
+const getDict = async () => {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
 
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -46,70 +62,111 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
-  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)
+    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
   })
 }
-// 搜索
-const searchList = () => {
+
+// 多选发生改变时
+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 clearList = () => {
   listQuery.value = {
-    businessSize: '',
-    // evaluation: '',
-    formId: SCHEDULE.BUSINESS_SUBPACKAGE_RECORD, // 表单id
-    grade: '',
-    outsourcerName: '',
-    outsourcerNo: '',
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    outsourcerName: '', // 	公司名称
+    businessSize: '', //	业务规模-字典code
+    grade: '', // 	履约评级-字典code
+    outsourcerNo: '', // 	分包方编号
     offset: 1,
     limit: 20,
   }
   fetchData()
 }
+
+// 搜索
+const searchList = () => {
+  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 = {
+      formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+      outsourcerName: listQuery.value.outsourcerName, // 	公司名称
+      businessSize: listQuery.value.businessSize, //	业务规模-字典code
+      grade: listQuery.value.grade, // 	履约评级-字典code
+      outsourcerNo: listQuery.value.outsourcerNo, // 	分包方编号
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportRecordList(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 handleSelectionChange = () => {
-
-}
-// 详情
-const handleDetail = (row: IRecordList) => {
+// 点击详情
+const goDetail = (row: IList, val: string) => {
   $router.push({
-    name: 'subpackageArchivesDetail',
-    params: {
-      type: 'detail',
-      id: row.id,
-    },
-    query: {
-      title: '详情',
-    },
+    path: `archives/${val}/${row.id}`,
   })
 }
 
 onMounted(async () => {
-  fetchData()
+  await getDict() // 获取字典
+  fetchData(true)
 })
 </script>
 
@@ -119,28 +176,26 @@
     <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.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerName" placeholder="公司名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessSize" placeholder="业务规模" class="short-input" clearable />
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模" clearable>
+            <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.grade" placeholder="履约评级" class="short-input" clearable />
+          <el-select v-model="listQuery.grade" placeholder="履约评级" clearable>
+            <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button
-            icon="icon-export" title="导出" type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            icon="icon-print" title="打印" type="primary"
-            @click="printList"
-          />
+          <icon-button v-if="proxy.hasPerm('/subpackage/archives/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/subpackage/archives/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
@@ -154,9 +209,19 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="180">
+            <el-table-column
+              label="操作"
+              align="center"
+              fixed="right"
+              :width="90"
+            >
               <template #default="{ row }">
-                <el-button size="small" link type="primary" @click="handleDetail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="goDetail(row, 'detail')"
+                >
                   详情
                 </el-button>
               </template>

diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index 2b12805..2920b0c 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -2,10 +2,10 @@
  * 分包方档案接口
  */
 import request from '../../index'
-import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface'
+import type { IListQuery } from '@/views/business/subpackage/record/record-interface'
 
 // 列表查询
-export function getListPage(data: IListQueryRecord) {
+export function getListPage(data: IListQuery) {
   return request({
     url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -13,136 +13,12 @@
   })
 }
 
-// 批量删除
-export function batchDel(data: object) {
-  return request({
-    url: '/business/outsourcer/batchDelete',
-    method: 'post',
-    data,
-  })
-}
-
-// 草稿箱删除
-export function outsourcerDel(data: object) {
-  return request({
-    url: '/business/outsourcer/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案详情
-export function detail(data: object) {
-  return request({
-    url: '/business/outsourcer/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑
-export function draftUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/draftUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案编辑驳回后编辑
-export function failUpdate(data: object) {
-  return request({
-    url: '/business/outsourcer/failUpdate',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表详情
-export function rowDetail(data: object) {
-  return request({
-    url: '/business/outsourcer/list',
-    method: 'post',
-    data,
-  })
-}
-
-// 档案导出
-export function listExport(data: object) {
+// 导出
+export function exportRecordList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
     url: '/business/outsourcer/listExport',
     method: 'post',
-    data,
-  })
-}
-
-// 分包方人员
-// 新增
-export function outsourcerUserAdd(data: object) {
-  return request({
-    url: '/business/outsourcerUser/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerUserDelete(data: object) {
-  return request({
-    url: '/business/outsourcerUser/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerUserList(data: object) {
-  return request({
-    url: '/business/outsourcerUser/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerUserListPage(data: object) {
-  return request({
-    url: '/business/outsourcerUser/listPage',
-    method: 'post',
-    data,
-  })
-}
-// 分包方业务能力
-// 新增
-export function outsourcerAbilityAdd(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 删除
-export function outsourcerAbilityDelete(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 列表
-export function outsourcerAbilityList(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/list',
-    method: 'post',
-    data,
-  })
-}
-// 分页
-export function outsourcerAbilityListPage(data: object) {
-  return request({
-    url: '/business/outsourcerAbility/listPage',
-    method: 'post',
+    responseType: 'blob',
     data,
   })
 }
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..86c3754 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,7 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否显示表头红星星
+  reg?: any // 校验规则
 }
 
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 38f65ec..aa682e8 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -461,7 +461,7 @@
         },
       },
       {
-        path: 'subpackage/archives/detail/:id?',
+        path: 'archives/:type/:id?',
         name: 'subpackageArchivesDetail',
         component: () => import('@/views/business/subpackage/record/edit.vue'),
         meta: {
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..44802d0 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -18,6 +18,16 @@
 }
 
 /**
+ *判断是否是数字
+ * @param value
+ * @returns 是否合法
+ */
+export const isNumber = (value: any) => {
+  var rep = /^[0-9]+.?[0-9]*$/
+  return rep.test(value)
+}
+
+/**
  * 判断是否为ip
  * @param ip 待判断
  * @returns 是否合法
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index af4ff99..42da39b 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -17,7 +17,6 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const approvalDialog = ref() // 审批对话ref
-
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -101,10 +100,10 @@
   }
   // 模拟数据
   getListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item) => {
+    list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCountryName + item.addressCityName + item.addressAreaName + item.fullAddress : item.addressCountryName + item.addressProvinceName + item.addressCityName + item.addressAreaName + item.fullAddress,
+        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
@@ -116,7 +115,16 @@
 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 clearList = () => {
   listQuery.value = {
diff --git a/src/views/business/subpackage/record/components/addRow.vue b/src/views/business/subpackage/record/components/addRow.vue
deleted file mode 100644
index 07b03d1..0000000
--- a/src/views/business/subpackage/record/components/addRow.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '110px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '周检记录',
-    form: {
-
-    },
-  },
-  {
-    name: '状态变更记录',
-    form: {
-
-    },
-  },
-  {
-    name: '使用记录',
-    form: {
-
-    },
-  },
-  {
-    name: '检定证书',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '周检记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="记录人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="检定日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="有效日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="送检人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '状态变更记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
-                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="申请人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '使用记录'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="使用部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用开始日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="使用结束日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-if="name === '检定证书'">
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书编号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-              <el-input v-model="form.certificateNo" placeholder="证书名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书出具日期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-              <el-date-picker
-                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="证书有效期" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/business/subpackage/record/components/outsourcerAbility.vue b/src/views/business/subpackage/record/components/outsourcerAbility.vue
deleted file mode 100644
index 7a91322..0000000
--- a/src/views/business/subpackage/record/components/outsourcerAbility.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- 分包方业务能力 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerAbility } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerAbility>({
-  abilityDesc: '', // 能力描述
-  abilityName: '', // 能力名称
-  createTime: '', // 创建时间（列表返回参数）
-  id: '', //
-  outsourcerId: '', // 分包方id
-  price: '', // 报价
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '能力名称', value: 'abilityName', align: 'center', width: '160px' },
-  { text: '能力描述', value: 'abilityDesc', align: 'center' },
-  { text: '报价', value: 'price', align: 'center', width: '160px' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/outsourcerUser.vue b/src/views/business/subpackage/record/components/outsourcerUser.vue
deleted file mode 100644
index 4f9a310..0000000
--- a/src/views/business/subpackage/record/components/outsourcerUser.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- 分包方人员 -->
-<script lang="ts" setup>
-import { ref } from 'vue'
-import type { IOutsourcerUser } from '../../subpackage-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { outsourcerUserListPage } from '@/api/business/subpackage/record'
-
-// 查询条件
-const listQuery = ref<IOutsourcerUser>({
-  createTime: '', // 创建时间（列表返回参数）
-  department: '', // 部门
-  id: '', //
-  job: '', // 职务
-  name: '', // 人员名字
-  outsourcerId: '', // 分包方id
-  phone: '', // 联系方式
-  userNo: '', // 人员编号-手动输入
-  offset: 1,
-  limit: 20,
-})
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center', width: '160px' },
-  { text: '工作部门', value: 'department', align: 'center' },
-  { text: '职务', value: 'job', align: 'center', width: '160px' },
-  { text: '联系方式', value: 'phone', align: 'center' },
-])
-const list = ref([])
-const loadingTable = ref(false)
-const total = ref(0)
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  // 模拟数据
-  loadingTable.value = false
-  outsourcerUserListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 分页
-const changePage = () => {
-
-}
-// 选中
-const handleSelectionChange = () => {
-
-}
-onMounted(async () => {
-  fetchData()
-})
-</script>
-
-<template>
-  <normal-table
-    :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-    is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
-  >
-    <template #preColumns>
-      <el-table-column label="序号" width="55" align="center">
-        <template #default="scope">
-          {{ (listQuery.offset! - 1) * listQuery.limit! + scope.$index + 1 }}
-        </template>
-      </el-table-column>
-    </template>
-  </normal-table>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/business/subpackage/record/components/templateTable.vue b/src/views/business/subpackage/record/components/templateTable.vue
index 51c05f1..82acc77 100644
--- a/src/views/business/subpackage/record/components/templateTable.vue
+++ b/src/views/business/subpackage/record/components/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
@@ -20,12 +20,20 @@
     type: Number,
     default: 0,
   },
+  pagination: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['changePage'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
 })
+watch(() => props.columns, () => {
+  console.log(searchQuery.value)
+  searchQuery.value.offset = 1
+})
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -44,6 +52,7 @@
       :data="list" :total="total" :columns="columns"
       :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
       :list-loading="loading"
+      :pagination="pagination"
       @change="changePage"
     />
   </div>
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 8ca3ed4..4559a80 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -1,447 +1,816 @@
-<!-- 分包方档案详情 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ref } from 'vue'
-import type { IRecordDetail } from '../subpackage-interface'
-import outsourcerUser from './components/outsourcerUser.vue'
-import outsourcerAbility from './components/outsourcerAbility.vue'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/record'
-import { fetchApproval, submitApproval } from '@/api/approval'
+<!-- 分包方资格审批详情 -->
+<script lang="ts" setup name="SubpackageApproveEdit">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { IAbility, IMenu, IMenuDetail, Iperson } from './record-interface'
+import TemplateTable from './components/templateTable.vue'
+import { isNumber, validatePhone } from '@/utils/validate'
+import type { CustomerPerson, ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import type { IForm, dictType } from '@/views/business/subpackage/approve/approve-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import { UploadFile } from '@/api/measure/file'
 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'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('detail') // 页面类型: add, edit, detail
+const submitId = ref('') // 提交使用的id
+const approvalStatusName = ref('') // 审批状态名字
 const $route = useRoute()
-const $router = useRouter()
 const query = $route.query
-const menu = ref<IMenu[]>([
-  {
-    name: '分包方人员',
-    id: '0',
-  },
-  {
-    name: '业务能力',
-    id: '1',
-  },
-  {
-    name: '项目记录',
-    id: '2',
-  },
-  {
-    name: '合同记录',
-    id: '3',
-  },
-  {
-    name: '检定证书',
-    id: '4',
-  },
-])
-// 详情按钮组合
-// 当前点击
-const active = ref('')
-// 当前点击名称
-const currentMenuTitle = ref('')
-const detailForm = ref<IRecordDetail>({
-  addressArea: '', // 公司地址-区编码
-  addressAreaName: '', // 公司地址-区
-  addressCity: '', // 公司地址-市编码
-  addressCityName: '', // 公司地址-市
-  addressCountry: '', // 公司地址-国家编码
-  addressCountryName: '', // 公司地址-国家
-  addressProvince: '', // 公司地址-省编码
-  addressProvinceName: '', // 公司地址-省
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+
+// 表单
+const dataForm: Ref<IForm> = ref({
+  id: '',
+  businessContent: '', // 业务内容
+  outsourcerName: '', // 公司名称
+  outsourcerNo: '', // 分包方编号
   bankAccount: '', // 银行账户名
   bankAccountNumber: '', // 银行账号
   bankName: '', // 银行名称
-  businessContent: '', // 业务内容
+  outsourcerBriefName: '', // 公司简称
   businessScope: '', // 公司业务范围
+  grade: '', // 履约评级
+  outsourcerSize: '', // 公司规模
   businessSize: '', // 业务规模-字典code
-  businessSizeName: '', // 业务规模-字典value
-  createTime: '', // 创建时间（列表接口返回参数）
-  director: '', // 负责人
-  email: '', // 邮箱
-  evaluation: '', // 整体评价-字典code
-  evaluationName: '', // 整体评价-字典value
+  evaluation: '', // 整体评价
   fullAddress: '', // 公司地址-详细地址
-  grade: '', // 履约评级-字典code
-  gradeName: '', // 履约评级-字典value
-  id: '', // 主键id（列表、更新、详情接口参数）
-  invoiceArea: '', // 开票地址-区编码
-  invoiceAreaName: '', // 开票地址-区
-  invoiceCity: '', // 开票地址-市编码
-  invoiceCityName: '', // 开票地址-市
-  invoiceCountry: '', // 开票地址-国家编码
-  invoiceCountryName: '', // 开票地址-国家
+  addressArea: '', // 公司地址-区编码
+  addressCity: '', // 公司地址-市编码
+  addressCountry: '', // 公司地址-国家编码
+  addressProvince: '', // 公司地址-省编码
+  addressAreaName: '', // 公司地址-区
+  addressCityName: '', // 公司地址-市
+  addressCountryName: '', // 公司地址-国家
+  addressProvinceName: '', // 公司地址-省
+  director: '', // 负责人
+  // fax: '', // 传真
   invoiceFullAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区编码
+  invoiceCity: '', // 开票地址-市编码
+  invoiceCountry: '', // 开票地址-国家编码
   invoiceProvince: '', // 开票地址-省编码
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', // 开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
   invoiceProvinceName: '', // 开票地址-省
+  email: '', // 邮箱
   minioFileName: '', // minio存储文件名
   mobile: '', // 手机
-  outsourcerBriefName: '', // 公司简称
-  outsourcerName: '', // 公司名称
-  outsourcerNo: '', // 分包方编号
-  outsourcerSize: '', // 公司规模-字典code
-  outsourcerSizeName: '', // 公司规模-字典value
-  phone: '', // 电话
-  postalCode: '', // 邮编
-  processId: '', // 流程实例id（未通过编辑接口必传参数）
+  phone: '', // phone
+  postalCode: '', // postalCode
+  processId: '', // 流程实例id
   remark: '', // 备注
   taxNumber: '', // 税号
   website: '', // 网址
 })
+const fullAddress = ref<string[]>([]) // 公司地址
+const invoiceFullAddress = ref<string[]>([]) // 开票地址
+const ruleFormRef = ref<FormInstance>()
+// 初始化router
+const $router = useRouter()
 
-// 校验规则
-const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
-  outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
-  outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  website: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
-  preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
-  preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
-})
-
-const getDetail = () => {
-  detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
-    detailForm.value = res.data
+// -----------------------------------------路由参数--------------------------------
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典-----------------------------------------
+const companySizeList = ref<dictType[]>([]) // 公司规模列表
+const businessSizeList = ref<dictType[]>([]) // 业务规模列表
+const gradeList = ref<dictType[]>([]) // 履约评级列表
+const evaluationList = ref<dictType[]>([]) // 整体评价列表
+function getDict() {
+  // 获取公司规模
+  getDictByCode('companySize').then((response) => {
+    companySizeList.value = response.data
+  })
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+  // 获取整体评价
+  getDictByCode('evaluation').then((response) => {
+    evaluationList.value = response.data
   })
 }
+// -----------------------------------------表格--------------------------------------
+const SelectionList = ref([]) // 表格选中
+const abilityList: Ref<IAbility[]> = ref([]) // 业务能力列表
+const personList: Ref<Iperson[]> = ref([]) // 人员列表
 
-// 关闭新增页面的回调
+// 其他关联数据列表
+const dataList = ref({
+  // personList: [] as Iperson[], // 人员列表
+  abilityList: [] as IAbility[], // 业务能力列表
+  projectRecords: [], // 项目记录
+  contractRecords: [], // 合同记录
+  certificationRecords: [], // 证书记录
+})
+
+const menuEdit = ref<IMenu[]>([
+  {
+    name: '分包方人员',
+    columns: [
+      { text: '编号', value: 'userNo', required: true },
+      { text: '姓名', value: 'name', required: true },
+      { text: '工作部门', value: 'department' },
+      { text: '职务', value: 'job' },
+      { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
+    ],
+    pagination: false,
+    list: 'personList',
+    searchFunc: null,
+  },
+  {
+    name: '业务能力',
+    columns: [
+      { text: '能力名称', value: 'abilityName', required: true },
+      { text: '能力描述', value: 'abilityDesc', required: true },
+      { text: '报价', value: 'price', required: true, reg: isNumber },
+    ],
+    pagination: false,
+    list: 'abilityList',
+    searchFunc: null,
+  },
+]) // 分包方人员和业务能力
+
+// 获取合同记录
+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: '项目记录',
+    columns: [
+      { text: '分包项目编号', value: 'projectNo' },
+      { text: '分包项目名称', value: 'projectName' },
+      { text: '申请人', value: 'applicantName' },
+      { text: '申请时间', value: 'applicantTime' },
+      { text: '验收状况', value: 'checkConclusion' },
+      { text: '验收时间', value: 'checkTime' },
+    ],
+    pagination: true,
+    list: 'projectRecords',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    searchFunc: null,
+  },
+  {
+    name: '合同记录',
+    columns: [
+      { text: '合同编号', value: 'contractCode' },
+      { text: '合同名称', value: 'contractName' },
+      { text: '合同金额', value: 'contractPrice' },
+      { text: '合同状态', value: 'contractStatus' },
+      { text: '合同时间', value: 'contractTime' },
+      { text: '负责人', value: 'aCompanyDutyman' },
+    ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    list: 'contractRecords',
+    pagination: true,
+    searchFunc: fetchContractRecords,
+  },
+  {
+    name: '检定证书',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+])
+const currentMenuEdit = ref('分包方人员')
+const currentMenuEditObj = computed(() => {
+  return menuEdit.value.find(item => item.name === currentMenuEdit.value)
+})
+const currentMenuDetail = ref('项目记录')
+const currentMenuDetailObj = computed(() => {
+  return menuDetail.value.find(item => item.name === currentMenuDetail.value)
+})
+
+// 人员对象
+const addPersonObj: Iperson = {
+  department: '', // 部门
+  job: '', // 职务
+  name: '', // 名字
+  outsourcerId: '', // 分包方id
+  phone: '', // 手机
+  userNo: '', // 人员编号
+  createTime: '', // 创建时间
+  id: '',
+  editable: true,
+}
+// 业务能力对象
+const addAbilityObj: IAbility = {
+  abilityDesc: '', // 能力描述
+  abilityName: '', // 能力名称
+  outsourcerId: '',
+  price: '', // 报价
+  createTime: '', // 创建时间
+  id: '',
+  editable: true,
+}
+
+// 检查列表
+function checkPersonList(list: any) {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of currentMenuEditObj.value!.columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
+
+// 将所有信息列表置为不可编辑状态
+function setAllRowReadable(list: any) {
+  for (const item of list) {
+    item.editable = false
+  }
+}
+// -----------------------------------------人员信息------------------------------------------
+
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (currentMenuEdit.value === '分包方人员') {
+    setAllRowReadable(personList.value)
+    row.editable = true
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    setAllRowReadable(abilityList.value)
+    row.editable = true
+  }
+}
+
+// 点击增加行
+const addRow = () => {
+  if (currentMenuEdit.value === '分包方人员') {
+    console.log('分包方人员增加')
+
+    // 检查上一行必填项
+    if (checkPersonList(personList.value)) {
+      setAllRowReadable(personList.value)
+      personList.value.push({ ...addPersonObj })
+    }
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    console.log('业务能力增加')
+
+    // 检查上一行必填项
+    if (checkPersonList(abilityList.value)) {
+      setAllRowReadable(abilityList.value)
+      abilityList.value.push({ ...addAbilityObj })
+    }
+  }
+}
+
+// 删除行
+const deleteList = () => {
+  if (currentMenuEdit.value === '分包方人员') {
+    personList.value = personList.value.filter((item: Iperson) => {
+      return !SelectionList.value.includes(item)
+    })
+  }
+  if (currentMenuEdit.value === '业务能力') {
+    abilityList.value = abilityList.value.filter((item: IAbility) => {
+      return !SelectionList.value.includes(item)
+    })
+  }
+}
+// 表格选中
+const handleSelectionChange = (e: CustomerPerson[]) => {
+  SelectionList.value = e
+}
+// -----------------------------------------业务能力-------------------------------------------------
+
+// ---------------------------------------------------------------------------------------------------
+// 获取详情表单
+const getInfo = () => {
+  loading.value = true
+  detail({ id: infoId.value }).then((res) => {
+    loading.value = false
+    dataForm.value = res.data
+    if (pageType.value == 'detail') {
+      fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+    }
+    else {
+      fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+    }
+  })
+}
+// 关闭
 const close = () => {
   $router.back()
 }
-// 文件上传
-const fileRef = ref()
+// 公司地址变化后给对象赋值
+function fullAddressChange(addressObj: IAddress) {
+  dataForm.value.addressCountry = addressObj.country
+  dataForm.value.addressProvince = addressObj.province
+  dataForm.value.addressCity = addressObj.city
+  dataForm.value.addressArea = addressObj.area
+  dataForm.value.fullAddress = addressObj.address
+  dataForm.value.addressCountryName = addressObj.countryName
+  dataForm.value.addressProvinceName = addressObj.provinceName
+  dataForm.value.addressCityName = addressObj.cityName
+  dataForm.value.addressAreaName = addressObj.areaName
+}
+// 开票地址发生变化
+function invoiceFullAddressChange(addressObj: IAddress) {
+  dataForm.value.invoiceCountry = addressObj.country
+  dataForm.value.invoiceProvince = addressObj.province
+  dataForm.value.invoiceCity = addressObj.city
+  dataForm.value.invoiceArea = addressObj.area
+  dataForm.value.invoiceFullAddress = addressObj.address
+  dataForm.value.invoiceCountryName = addressObj.countryName
+  dataForm.value.invoiceProvinceName = addressObj.provinceName
+  dataForm.value.invoiceCityName = addressObj.cityName
+  dataForm.value.invoiceAreaName = addressObj.areaName
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '客户详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>分包方档案详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  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) => {
+          if (res.code === 200) {
+            submitId.value = res.data.id
+            loading.close()
+            ElMessage.success('保存成功')
+            close()
+          }
+        }).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()
+          })
+        }
+      }
+    }
+  })
+}
+// 提交
+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('请先保存！')
+  }
+}
+
+// -----------------------------------------文件上传-----------------------------------
+const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    detailForm.value.minioFileName = event.target.files[0].name
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
 }
 const upload = () => {
   fileRef.value.click()
 }
-
-// 公司地址变化后给对象赋值
-function fullAddressChange(addressObj: IAddress) {
-  // dataForm.value.addressCountry = addressObj.country
-  // dataForm.value.addressProvince = addressObj.province
-  // dataForm.value.addressCity = addressObj.city
-  // dataForm.value.addressArea = addressObj.area
-  // dataForm.value.fullAddress = addressObj.address
-  // dataForm.value.addressCountryName = addressObj.countryName
-  // dataForm.value.addressProvinceName = addressObj.provinceName
-  // dataForm.value.addressCityName = addressObj.cityName
-  // dataForm.value.addressAreaName = addressObj.areaName
-}
-// 开票地址发生变化
-function invoiceFullAddressChange(addressObj: IAddress) {
-  // dataForm.value.invoiceCountry = addressObj.country
-  // dataForm.value.invoiceProvince = addressObj.province
-  // dataForm.value.invoiceCity = addressObj.city
-  // dataForm.value.invoiceArea = addressObj.area
-  // dataForm.value.invoiceFullAddress = addressObj.address
-  // dataForm.value.invoiceCountryName = addressObj.countryName
-  // dataForm.value.invoiceProvinceName = addressObj.provinceName
-  // dataForm.value.invoiceCityName = addressObj.cityName
-  // dataForm.value.invoiceAreaName = addressObj.areaName
-}
-
-// 切换tab状态
-const changeCurrentButton = (val: string) => {
-  console.log(val)
-  active.value = val
-  currentMenuTitle.value = menu.value.filter((item) => {
-    return item.id === val
-  })[0].name
-}
+// -------------------------------------------审批流程----------------------------------------
 
 onMounted(() => {
-  if (query.title !== '新建') {
-    getDetail()
+  approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
+  dataForm.value.processId = query.processId as string // 流程实例id
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
   }
-  active.value = '0'
+  getDict()
 })
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
-    <detail-page title="分包方档案">
+  <app-container>
+    <detail-page v-loading="loading" :title="`分包方档案-${textMap[pageType]}`">
       <template #btns>
-        <el-button type="primary">
+        <!-- <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 type="primary">
-          编辑/保存
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
-      <!-- 基本信息 -->
-      <el-form
-        ref="ruleFormRef"
-        :model="detailForm"
-        :label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="分包方编号:" prop="outsourcerNo">
-              <el-input
-                v-model="detailForm.outsourcerNo" disabled
-              />
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="分包方编号:" prop="outsourcerNo">
+                <el-input
+                  v-model="dataForm.outsourcerNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="公司名称:" prop="outsourcerName">
+                <el-input
+                  v-model.trim="dataForm.outsourcerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入公司名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="公司简称:">
+                <el-input
+                  v-model="dataForm.outsourcerBriefName"
+                  :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="businessContent">
+                <el-input
+                  v-model.trim="dataForm.businessContent"
+                  :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="outsourcerSize">
+                <el-select v-model="dataForm.outsourcerSize" :placeholder="pageType === 'detail' ? ' ' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in companySizeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务规模" prop="businessSize">
+                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? ' ' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="履约评级" prop="grade">
+                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? ' ' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="整体评价" prop="evaluation">
+                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? ' ' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-option v-for="item in evaluationList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="税号:" prop="taxNumber">
+                <el-input
+                  v-model="dataForm.taxNumber"
+                  :placeholder="pageType === 'detail' ? '' : '请输入税号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行账户名:">
+                <el-input
+                  v-model="dataForm.bankAccount"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行账户名'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行名称:">
+                <el-input
+                  v-model="dataForm.bankName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="银行账号:">
+                <el-input
+                  v-model="dataForm.bankAccountNumber"
+                  :placeholder="pageType === 'detail' ? '' : '请输入银行账号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮编:">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入邮编'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="负责人:">
+                <el-input
+                  v-model="dataForm.director"
+                  :placeholder="pageType === 'detail' ? '' : '请输入负责人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电话:">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="6">
+              <el-form-item label="传真:">
+                <el-input
+                  v-model="dataForm.fax"
+                  :placeholder="pageType === 'detail' ? '' : '请输入传真'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="6">
+              <el-form-item label="手机:">
+                <el-input
+                  v-model="dataForm.mobile"
+                  :placeholder="pageType === 'detail' ? '' : '请输入手机'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮箱:">
+                <el-input
+                  v-model="dataForm.email"
+                  :placeholder="pageType === 'detail' ? '' : '请输入邮箱'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="网址:">
+                <el-input
+                  v-model="dataForm.website"
+                  :placeholder="pageType === 'detail' ? '' : '请输入网址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="5">
+            <el-form-item label="公司地址:">
+              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="outsourcerName">
-              <el-input
-                v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
-              />
+          </el-row>
+          <el-row :gutter="5">
+            <el-form-item label="开票地址:">
+              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司简称:" prop="outsourcerBriefName">
-              <el-input
-                v-model="detailForm.outsourcerBriefName" disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="detailForm.businessContent" disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="公司规模:" prop="outsourcerSize">
-              <el-input
-                v-model="detailForm.outsourcerSize"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务规模:" prop="businessSize">
-              <el-input
-                v-model="detailForm.businessSize"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="履约评级:" prop="grade">
-              <el-input
-                v-model="detailForm.grade"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="整体评价:" prop="evaluation">
-              <el-input
-                v-model="detailForm.evaluation"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="detailForm.taxNumber"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:" prop="bankAccount">
-              <el-input
-                v-model="detailForm.bankAccount"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:" prop="bankName">
-              <el-input
-                v-model="detailForm.bankName"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:" prop="bankAccountNumber">
-              <el-input
-                v-model="detailForm.bankAccountNumber"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:" prop="postalCode">
-              <el-input
-                v-model="detailForm.postalCode"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="detailForm.director"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:" prop="phone">
-              <el-input
-                v-model="detailForm.phone"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:" prop="website">
-              <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:" prop="mobile">
-              <el-input
-                v-model="detailForm.mobile"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:" prop="email">
-              <el-input
-                v-model="detailForm.email"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:" prop="website">
-              <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="公司地址:" prop="website">
-              <!-- todo -->
-              <!-- <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              /> -->
-              <address-select :data="[]" :detail="query.title === '详情'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="开票用地址:" prop="website">
-              <!-- todo -->
-              <!-- <el-input
-                v-model="detailForm.website"
-                :disabled="query.title === '详情'"
-              /> -->
-              <address-select :data="[]" :detail="query.title === '详情'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:" prop="businessScope">
-              <el-input
-                v-model="detailForm.businessScope"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" />
-          <el-col :span="14">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="detailForm.remark"
-                :disabled="query.title === '详情'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" />
-          <el-col :span="6">
-            <el-form-item label="附件:" prop="minioFileName">
-              <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
-              <span v-if="query.title === '详情' && !detailForm.minioFileName">无</span>
-              <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.minioFileName || ''" style="display: inline-block;" />
-              </div>
-              <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
-                {{ detailForm.minioFileName ? '更换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-          <el-col :span="18" />
-        </el-row>
-      </el-form>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="14">
+              <el-form-item label="公司业务范围:">
+                <el-input
+                  v-model="dataForm.businessScope"
+                  :placeholder="pageType === 'detail' ? '' : '请输入公司业务范围'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="14">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </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.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <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.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </detail-page>
-    <detail-block :title="currentMenuTitle">
-      <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
-    </detail-block>
-    <template
-      #btns
-    >
-      <el-button type="primary">
-        增加行
-      </el-button>
-      <el-button type="info">
-        删除行
-      </el-button>
-    </template>
-    <outsourcer-user v-if="active === '1'" />
-    <outsourcer-ability v-if="active === '2'" />
-    <!-- 分包方人员 -->
-    <!-- 业务能力 -->
-    <!-- 项目记录 -->
-    <!-- 合同记录 -->
-    <!-- 检定证书 -->
+
+    <detail-block-switch :title="currentMenuEdit">
+      <template #menu>
+        <el-radio-group v-model="currentMenuEdit">
+          <el-radio-button v-for="item in menuEdit" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        v-loading="loading"
+        :data="currentMenuEdit === '分包方人员' ? personList : abilityList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in currentMenuEditObj!.columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block-switch>
+    <detail-block-switch :title="currentMenuDetail">
+      <template #menu>
+        <el-radio-group v-model="currentMenuDetail">
+          <el-radio-button v-for="item in menuDetail" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </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" />
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-::v-deep.container .btns {
-  position: static !important;
-}
 </style>
+
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0263347..657800b 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -1,42 +1,58 @@
 <!-- 分包方档案列表 -->
-<script lang="ts" setup name="record">
+<script lang="ts" setup name="subpackageRecordList">
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
-import type { DateModelType } from 'element-plus'
-import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery } from './record-interface'
+import type { IList } from '@/views/business/subpackage/approve/approve-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getListPage } from '@/api/business/subpackage/record'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/views/device/receive/receive'
+import { exportRecordList, getListPage } from '@/api/business/subpackage/record'
 import { SCHEDULE } from '@/utils/scheduleDict'
-const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const loadingTable = ref(false)
+const $router = useRouter()
 // 查询条件
-const listQuery: Ref<IListQueryRecord> = ref({
-  businessSize: '', // 业务规模-字典code
+const listQuery: Ref<IListQuery> = ref({
   formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  outsourcerName: '', // 	公司名称
+  businessSize: '', //	业务规模-字典code
   grade: '', // 	履约评级-字典code
-  ids: [],
-  outsourcerName: '', // 分包方公司名字
-  outsourcerNo: '', // 编号
+  outsourcerNo: '', // 	分包方编号
   offset: 1,
   limit: 20,
 })
-const loadingTable = ref(false)
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '分包方编号', value: 'outsourcerNo', align: 'center', width: '160px' },
   { text: '公司名称', value: 'outsourcerName', align: 'center' },
-  { text: '公司规模', value: 'outsourcerSize', align: 'center' },
-  { text: '业务规模', value: 'businessSizeName', align: 'center' },
-  { text: '履约评级', value: 'gradeName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '公司规模', value: 'outsourcerSizeName', align: 'center', width: '110' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center', width: '130' },
+  { text: '履约评级', value: 'gradeName', align: 'center', width: '90' },
+  { text: '整体评价', value: 'evaluationName', align: 'center', width: '110' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
-const list = ref([])
-const total = ref(0)
+const list = ref<IList[]>([]) // 表格数据
+const total = ref(0) // 数据总条数
+const checkoutList = ref<string[]>([]) // 选中的内容
+const businessSizeList = ref<dictType[]>([]) // 业务规模列表
+const gradeList = ref<dictType[]>([]) // 履约评级列表
+const getDict = async () => {
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+}
 
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -46,70 +62,111 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
-  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)
+    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
   })
 }
-// 搜索
-const searchList = () => {
+
+// 多选发生改变时
+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 clearList = () => {
   listQuery.value = {
-    businessSize: '',
-    // evaluation: '',
-    formId: SCHEDULE.BUSINESS_SUBPACKAGE_RECORD, // 表单id
-    grade: '',
-    outsourcerName: '',
-    outsourcerNo: '',
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    outsourcerName: '', // 	公司名称
+    businessSize: '', //	业务规模-字典code
+    grade: '', // 	履约评级-字典code
+    outsourcerNo: '', // 	分包方编号
     offset: 1,
     limit: 20,
   }
   fetchData()
 }
+
+// 搜索
+const searchList = () => {
+  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 = {
+      formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+      outsourcerName: listQuery.value.outsourcerName, // 	公司名称
+      businessSize: listQuery.value.businessSize, //	业务规模-字典code
+      grade: listQuery.value.grade, // 	履约评级-字典code
+      outsourcerNo: listQuery.value.outsourcerNo, // 	分包方编号
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportRecordList(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 handleSelectionChange = () => {
-
-}
-// 详情
-const handleDetail = (row: IRecordList) => {
+// 点击详情
+const goDetail = (row: IList, val: string) => {
   $router.push({
-    name: 'subpackageArchivesDetail',
-    params: {
-      type: 'detail',
-      id: row.id,
-    },
-    query: {
-      title: '详情',
-    },
+    path: `archives/${val}/${row.id}`,
   })
 }
 
 onMounted(async () => {
-  fetchData()
+  await getDict() // 获取字典
+  fetchData(true)
 })
 </script>
 
@@ -119,28 +176,26 @@
     <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.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
         </search-item>
         <search-item>
           <el-input v-model.trim="listQuery.outsourcerName" placeholder="公司名称" class="short-input" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessSize" placeholder="业务规模" class="short-input" clearable />
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模" clearable>
+            <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.grade" placeholder="履约评级" class="short-input" clearable />
+          <el-select v-model="listQuery.grade" placeholder="履约评级" clearable>
+            <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button
-            icon="icon-export" title="导出" type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            icon="icon-print" title="打印" type="primary"
-            @click="printList"
-          />
+          <icon-button v-if="proxy.hasPerm('/subpackage/archives/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/subpackage/archives/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
@@ -154,9 +209,19 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="180">
+            <el-table-column
+              label="操作"
+              align="center"
+              fixed="right"
+              :width="90"
+            >
               <template #default="{ row }">
-                <el-button size="small" link type="primary" @click="handleDetail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="goDetail(row, 'detail')"
+                >
                   详情
                 </el-button>
               </template>
diff --git a/src/views/business/subpackage/record/record-interface.ts b/src/views/business/subpackage/record/record-interface.ts
new file mode 100644
index 0000000..1725f9f
--- /dev/null
+++ b/src/views/business/subpackage/record/record-interface.ts
@@ -0,0 +1,58 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+// 列表查询参数
+export interface IListQuery {
+  outsourcerName: string // 	公司名称
+  businessSize: string //	业务规模-字典code
+  grade: string // 	履约评级-字典code
+  outsourcerNo: string // 	分包方编号
+  formId: string
+  offset: number
+  limit: number
+}
+
+export interface IMenu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'abilityList' | 'projectRecords' | 'contractRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+export interface IMenuDetail {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'projectRecords' | 'contractRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+// 分包方人员表格
+export interface Iperson {
+  createTime: string // 创建时间
+  id: string
+  department: string // 部门
+  job: string // 职务
+  name: string // 名字
+  outsourcerId: string // 分包方id
+  phone: string // 手机
+  userNo: string // 人员编号
+  editable?: Boolean // 是否可编辑
+  [key: string]: any
+}
+
+// 业务能力表格
+export interface IAbility {
+  createTime: string // 创建时间
+  id: string
+  abilityDesc: string // 能力描述
+  abilityName: string // 能力名称
+  outsourcerId: string // 分包方id
+  price: string // 报价
+  editable?: Boolean // 是否可编辑
+  [key: string]: any
+}
+
+// 项目记录表格
+