diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 2bae678..9014135 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,10 +1,10 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageDirectoryList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelDirectory, editDirectory, getDetail, getListPage, submitDirectory, deleteDirectory } from '@/api/eqpt/subpackage/directory'
+import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
+import { cancelDirectory, deleteDirectory, editDirectory, getDetail, getListPage, submitDirectory } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 2bae678..9014135 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,10 +1,10 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageDirectoryList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelDirectory, editDirectory, getDetail, getListPage, submitDirectory, deleteDirectory } from '@/api/eqpt/subpackage/directory'
+import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
+import { cancelDirectory, deleteDirectory, editDirectory, getDetail, getListPage, submitDirectory } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue
index e9a2f4a..4c3becd 100644
--- a/src/views/tested/subpackage/directory/components/personTable.vue
+++ b/src/views/tested/subpackage/directory/components/personTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包方人员表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="DirectoryPerson">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -91,7 +86,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -117,11 +111,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -131,12 +125,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
             <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 2bae678..9014135 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,10 +1,10 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageDirectoryList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelDirectory, editDirectory, getDetail, getListPage, submitDirectory, deleteDirectory } from '@/api/eqpt/subpackage/directory'
+import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
+import { cancelDirectory, deleteDirectory, editDirectory, getDetail, getListPage, submitDirectory } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue
index e9a2f4a..4c3becd 100644
--- a/src/views/tested/subpackage/directory/components/personTable.vue
+++ b/src/views/tested/subpackage/directory/components/personTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包方人员表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="DirectoryPerson">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -91,7 +86,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -117,11 +111,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -131,12 +125,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
             <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/index.vue b/src/views/tested/subpackage/directory/index.vue
index c280004..093738e 100644
--- a/src/views/tested/subpackage/directory/index.vue
+++ b/src/views/tested/subpackage/directory/index.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="SubpackageDirectory">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 2bae678..9014135 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,10 +1,10 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageDirectoryList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelDirectory, editDirectory, getDetail, getListPage, submitDirectory, deleteDirectory } from '@/api/eqpt/subpackage/directory'
+import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
+import { cancelDirectory, deleteDirectory, editDirectory, getDetail, getListPage, submitDirectory } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue
index e9a2f4a..4c3becd 100644
--- a/src/views/tested/subpackage/directory/components/personTable.vue
+++ b/src/views/tested/subpackage/directory/components/personTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包方人员表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="DirectoryPerson">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -91,7 +86,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -117,11 +111,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -131,12 +125,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
             <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/index.vue b/src/views/tested/subpackage/directory/index.vue
index c280004..093738e 100644
--- a/src/views/tested/subpackage/directory/index.vue
+++ b/src/views/tested/subpackage/directory/index.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="SubpackageDirectory">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue
index 5065b78..f4cdd7c 100644
--- a/src/views/tested/subpackage/review/components/deviceTable.vue
+++ b/src/views/tested/subpackage/review/components/deviceTable.vue
@@ -1,5 +1,5 @@
 <!-- 受检设备信息列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="ReviewDeviceTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -8,13 +8,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -73,7 +68,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -84,7 +78,7 @@
 const deviceRef = ref()
 const confirm = (device: any) => {
   // 多选
-  device.forEach((item) => {
+  device.forEach((item: any) => {
     list.value.push({
       ...item,
       equipmentId: item.id,
@@ -123,14 +117,14 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-if="!scope.row.editable && !$route.path.includes('detail')">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 2bae678..9014135 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,10 +1,10 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageDirectoryList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelDirectory, editDirectory, getDetail, getListPage, submitDirectory, deleteDirectory } from '@/api/eqpt/subpackage/directory'
+import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
+import { cancelDirectory, deleteDirectory, editDirectory, getDetail, getListPage, submitDirectory } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue
index e9a2f4a..4c3becd 100644
--- a/src/views/tested/subpackage/directory/components/personTable.vue
+++ b/src/views/tested/subpackage/directory/components/personTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包方人员表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="DirectoryPerson">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -91,7 +86,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -117,11 +111,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -131,12 +125,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
             <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/index.vue b/src/views/tested/subpackage/directory/index.vue
index c280004..093738e 100644
--- a/src/views/tested/subpackage/directory/index.vue
+++ b/src/views/tested/subpackage/directory/index.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="SubpackageDirectory">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue
index 5065b78..f4cdd7c 100644
--- a/src/views/tested/subpackage/review/components/deviceTable.vue
+++ b/src/views/tested/subpackage/review/components/deviceTable.vue
@@ -1,5 +1,5 @@
 <!-- 受检设备信息列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="ReviewDeviceTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -8,13 +8,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -73,7 +68,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -84,7 +78,7 @@
 const deviceRef = ref()
 const confirm = (device: any) => {
   // 多选
-  device.forEach((item) => {
+  device.forEach((item: any) => {
     list.value.push({
       ...item,
       equipmentId: item.id,
@@ -123,14 +117,14 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-if="!scope.row.editable && !$route.path.includes('detail')">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 65e8fce..1e9693d 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="SubpackageReviewEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -8,7 +8,6 @@
 import subpackageDialog from './subpackageDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 2bae678..9014135 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,10 +1,10 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageDirectoryList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelDirectory, editDirectory, getDetail, getListPage, submitDirectory, deleteDirectory } from '@/api/eqpt/subpackage/directory'
+import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
+import { cancelDirectory, deleteDirectory, editDirectory, getDetail, getListPage, submitDirectory } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue
index e9a2f4a..4c3becd 100644
--- a/src/views/tested/subpackage/directory/components/personTable.vue
+++ b/src/views/tested/subpackage/directory/components/personTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包方人员表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="DirectoryPerson">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -91,7 +86,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -117,11 +111,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -131,12 +125,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
             <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/index.vue b/src/views/tested/subpackage/directory/index.vue
index c280004..093738e 100644
--- a/src/views/tested/subpackage/directory/index.vue
+++ b/src/views/tested/subpackage/directory/index.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="SubpackageDirectory">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue
index 5065b78..f4cdd7c 100644
--- a/src/views/tested/subpackage/review/components/deviceTable.vue
+++ b/src/views/tested/subpackage/review/components/deviceTable.vue
@@ -1,5 +1,5 @@
 <!-- 受检设备信息列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="ReviewDeviceTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -8,13 +8,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -73,7 +68,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -84,7 +78,7 @@
 const deviceRef = ref()
 const confirm = (device: any) => {
   // 多选
-  device.forEach((item) => {
+  device.forEach((item: any) => {
     list.value.push({
       ...item,
       equipmentId: item.id,
@@ -123,14 +117,14 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-if="!scope.row.editable && !$route.path.includes('detail')">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 65e8fce..1e9693d 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="SubpackageReviewEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -8,7 +8,6 @@
 import subpackageDialog from './subpackageDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue
index 1d84c6e..675251d 100644
--- a/src/views/tested/subpackage/review/components/list.vue
+++ b/src/views/tested/subpackage/review/components/list.vue
@@ -1,11 +1,9 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpakageReviewList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
-import { cancelReview, deleteReview, editReview, getDetail, getListPage, submitReview } from '@/api/eqpt/subpackage/review'
-import { getDictByCode } from '@/api/system/dict'
+import { cancelReview, deleteReview, getListPage, submitReview } from '@/api/eqpt/subpackage/review'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -150,7 +148,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此名录吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 2bae678..9014135 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,10 +1,10 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageDirectoryList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelDirectory, editDirectory, getDetail, getListPage, submitDirectory, deleteDirectory } from '@/api/eqpt/subpackage/directory'
+import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
+import { cancelDirectory, deleteDirectory, editDirectory, getDetail, getListPage, submitDirectory } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue
index e9a2f4a..4c3becd 100644
--- a/src/views/tested/subpackage/directory/components/personTable.vue
+++ b/src/views/tested/subpackage/directory/components/personTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包方人员表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="DirectoryPerson">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -91,7 +86,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -117,11 +111,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -131,12 +125,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
             <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/index.vue b/src/views/tested/subpackage/directory/index.vue
index c280004..093738e 100644
--- a/src/views/tested/subpackage/directory/index.vue
+++ b/src/views/tested/subpackage/directory/index.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="SubpackageDirectory">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue
index 5065b78..f4cdd7c 100644
--- a/src/views/tested/subpackage/review/components/deviceTable.vue
+++ b/src/views/tested/subpackage/review/components/deviceTable.vue
@@ -1,5 +1,5 @@
 <!-- 受检设备信息列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="ReviewDeviceTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -8,13 +8,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -73,7 +68,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -84,7 +78,7 @@
 const deviceRef = ref()
 const confirm = (device: any) => {
   // 多选
-  device.forEach((item) => {
+  device.forEach((item: any) => {
     list.value.push({
       ...item,
       equipmentId: item.id,
@@ -123,14 +117,14 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-if="!scope.row.editable && !$route.path.includes('detail')">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 65e8fce..1e9693d 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="SubpackageReviewEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -8,7 +8,6 @@
 import subpackageDialog from './subpackageDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue
index 1d84c6e..675251d 100644
--- a/src/views/tested/subpackage/review/components/list.vue
+++ b/src/views/tested/subpackage/review/components/list.vue
@@ -1,11 +1,9 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpakageReviewList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
-import { cancelReview, deleteReview, editReview, getDetail, getListPage, submitReview } from '@/api/eqpt/subpackage/review'
-import { getDictByCode } from '@/api/system/dict'
+import { cancelReview, deleteReview, getListPage, submitReview } from '@/api/eqpt/subpackage/review'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -150,7 +148,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此名录吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue
index c824f9b..c861d63 100644
--- a/src/views/tested/subpackage/review/components/subpackageDialog.vue
+++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue
@@ -1,5 +1,5 @@
 <!-- 分包方弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<script lang="ts" setup name="SubpackageDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -27,8 +27,8 @@
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
   if (newVal.length === 2) {
-    listQuery.value.certificateValidStart = newVal[0]
-    listQuery.value.certificateValidEnd = newVal[1]
+    listQuery.value.createTimeStart = newVal[0]
+    listQuery.value.createTimeEnd = newVal[1]
   }
 })
 // 表头
@@ -88,13 +88,13 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
-  listQuery.reviewNo = ''
-  listQuery.subcontractorCompanyName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  listQuery.value.createTimeEnd = ''
+  listQuery.value.createTimeStart = ''
+  listQuery.value.createUserName = ''
+  listQuery.value.reviewNo = ''
+  listQuery.value.subcontractorCompanyName = ''
+  listQuery.value.offset = 1
+  listQuery.value.limit = 20
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写

diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
new file mode 100644
index 0000000..f6f3ea6
--- /dev/null
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -0,0 +1,27 @@
+/**
+ * 分包证书管理接口
+ */
+import request from '@/api/index'
+// 列表
+export function getListPage(params: object) {
+  return request({
+    url: '/subcontract/certificate/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 新建编辑
+export function editCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteCertificate(data: object) {
+  return request({
+    url: `/subcontract/certificate/remove?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index bf750fb..c91417a 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1038,6 +1038,18 @@
               activeMenu: '/pcertificatelist',
             },
           },
+          {
+            path: '/pcertificatepage/:type',
+            name: 'PcertificatePageEdit',
+            component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index 1e4546b..9565d50 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
@@ -131,12 +132,13 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 const planRef = ref()
 // 选中的行
 const selectRow = ref()
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
   if (text === '关联计划') {
@@ -209,6 +211,7 @@
 <template>
   <detail-block-switch :title="`${$route.query.approvalType === '0' ? '提前' : '延迟'}送检列表`">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <select-plan ref="planRef" @add="confirmPlan" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 67710f3..d508fb1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
 const $props = defineProps({
@@ -18,42 +19,49 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isBtn: true,
   },
   {
     text: '统一编号',
     value: 'equipmentNo',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '型号规格',
     value: 'model',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '负责人',
     value: 'directorName',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '计量标识',
     value: 'meterIdentify',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
     required: false,
     isSelect: true, // 是否下拉框
+    isBtn: false,
   },
   {
     text: '安装位置',
     value: 'installLocation',
     required: false,
     isSelect: false, // 是否下拉框
+    isBtn: false,
   },
 ])
 const list = ref<IlistObjType[]>([])
@@ -104,20 +112,21 @@
 }
 // 点击设备名称输入框
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
-const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
-    deviceRef.value.initDialog(false)
-    isMuit.value = false
+    // deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
 // 选择设备
-const confirm = (device: IlistObjType) => {
+const confirm = (device: any) => {
+  console.log(device, '选中的设备')
   // 判断是单选还是多选
-  if (isMuit.value) {
+  if (Array.isArray(device)) {
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -125,16 +134,25 @@
         equipmentId: item.id,
         id: null,
         groupId: null,
+        editable: true,
+        planId: '',
+        planName: '',
+        planNo: '',
       })
     })
   }
   else {
     // 单选
+    // 判断是否重复
     const row = {
       ...device,
       equipmentId: device.id,
       id: null,
       groupId: null,
+      editable: true,
+      planId: '',
+      planName: '',
+      planNo: '',
     }
     list.value[selectRow.value] = row
   }
@@ -145,7 +163,6 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
-  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
@@ -164,6 +181,7 @@
 <template>
   <detail-block-switch title="计划列表">
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="batch">
         批量增加
@@ -191,14 +209,18 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.isBtn" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
-          />
-          <el-date-picker
-            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <!-- <el-date-picker
+            v-if="scope.row.editable && item.isSelect && !item.isBtn" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 22a466f..004ba11 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
@@ -128,12 +129,13 @@
 })
 // 设备弹窗组件
 const deviceRef = ref()
+const deviceSingeRef = ref()
 // 选中的行
 const selectRow = ref()
 // 单选设备
 const select = (text: string, index: any) => {
   if (text === '统一编号') {
-    deviceRef.value.initDialog(false)
+    deviceSingeRef.value.initDialog()
     selectRow.value = index
   }
 }
@@ -213,6 +215,7 @@
   <detail-block-switch title="任务单列表">
     <!-- 选择设备弹窗 -->
     <select-device ref="deviceRef" @add="confirm" />
+    <select-device-singe ref="deviceSingeRef" @add="confirm" />
     <!-- 上传组件 -->
     <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
     <template v-if="!$route.path.includes('detail')" #btns>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 9518f20..b0be4c5 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -49,7 +49,7 @@
   },
   {
     text: '出厂编号',
-    value: 'succeed',
+    value: 'manufactureNo',
     align: 'center',
   },
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 50f6347..19f9e65 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -128,35 +128,23 @@
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const fetchSelectData = () => {
-  // 设备使用状态
-  const fetchStatusList = () => {
-    getDictByCode('eqptDeviceUseStatus').then((res) => {
-      useStatusList.value = res.data
-    })
-  }
-  // 设备重要等级
-  const fetchLevelList = () => {
-    getDictByCode('eqptDeviceLevel').then((res) => {
-      levelList.value = res.data
-    })
-  }
-  // 设备分类
-  const fetchDeviceType = () => {
-    getDictByCode('eqptDeviceType').then((res) => {
-      deviceTypeList.value = res.data
-    })
-  }
-  // 设备在用信息
-  const fetchInUse = () => {
-    getDictByCode('eqptDeviceInUse').then((res) => {
-      inUseList.value = res.data
-    })
-  }
-  fetchStatusList()
-  fetchLevelList()
-  fetchDeviceType()
-  fetchInUse()
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+  getDictByCode('eqptDeviceLevel').then((res) => {
+    levelList.value = res.data
+  })
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    inUseList.value = res.data
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchSelectData()
 // 加载组织机构树形下拉
@@ -643,7 +631,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
-                <el-input v-model.trim="ruleForm.meterIdentify" />
+                <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                  <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 7d0037f..2aa46c7 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -32,7 +32,7 @@
   fileName: '',
   fileNo: '',
   fileType: '',
-  id: 0,
+  id: '',
   implementationStatus: '',
   remark: '',
   updateTime: '',
@@ -63,14 +63,19 @@
 onMounted(() => {
   initDialog()
 })
-// 获取是否加急下拉列表
-// const isUrgentList = ref<{ id: string; value: string; name: string }[]>()
-// const fetchListData = () => {
-//   getDictByCode('eqptisUrgent').then((res) => {
-//     isUrgentList.value = res.data
-//   })
-// }
-// fetchListData()
+// 获取字典下拉
+const fileTypeList = ref<{ id: string; value: string; name: string }[]>() // 文件类别
+const statusList = ref<{ id: string; value: string; name: string }[]>() // 实施状态
+const fetchListData = () => {
+  // 文件类别
+  getDictByCode('eqptFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+  getDictByCode('eqptImplementStatus').then((res) => {
+    statusList.value = res.data
+  })
+}
+fetchListData()
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -187,17 +192,15 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件类别" prop="fileType">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.fileType" placeholder="文件类别" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in fileTypeList" :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="implementationStatus">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
               <el-select v-model="ruleForm.implementationStatus" placeholder="实施状态" style="width: 100%;">
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,5 +233,14 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index 9d6637e..0ac7cf3 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -23,7 +23,7 @@
   },
   {
     text: '类别',
-    value: 'fileType',
+    value: 'fileTypeName',
     align: 'center',
   },
   {
@@ -38,7 +38,7 @@
   },
   {
     text: '实施状态',
-    value: 'implementationStatus',
+    value: 'implementationStatusName',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index 597b695..94f8c2e 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -24,7 +24,7 @@
   },
   {
     text: '变更类型',
-    value: 'logType',
+    value: 'logTypeName',
     required: true,
     isSelect: false, // 是否下拉框
   },
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index 68fa95c..218573f 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -5,7 +5,7 @@
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
 import { cancelStatus, deleteStatus, detailStatus, editStatus, submitStatus } from '@/api/eqpt/status/index'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -243,7 +243,7 @@
 }
 const deviceRef = ref()
 const selectDeviceFun = () => {
-  deviceRef.value.initDialog(false)
+  deviceRef.value.initDialog()
 }
 const confirm = (row: any) => {
   const data = row
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
new file mode 100644
index 0000000..abe1c68
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -0,0 +1,333 @@
+<!-- 分包方证书-编辑 -->
+<script lang="ts" setup name="SubpackageCertificiateEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { editCertificate } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/review/components/subpackageDialog.vue'
+import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref<{ [key: string]: string }>({
+  certificateName: '',
+  certificateNo: '',
+  certificateReport: '',
+  certificateValid: '',
+  checkDate: '',
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  equipmentId: '',
+  equipmentManufactureNo: '',
+  equipmentModel: '',
+  equipmentName: '',
+  equipmentNo: '',
+  id: '',
+  meterIdentify: '',
+  originalRecord: '',
+  subcontractorId: '',
+  subcontractorName: '',
+  subcontractorNo: '',
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }],
+  equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
+
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type !== 'create') {
+    const data = JSON.parse($route.query.row as string)
+    ruleForm.value = data
+  }
+  if ($route.params.type === 'create' || $route.params.type === 'update') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+      ruleForm.value.createDeptName = res.data.fullName
+    })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 获取计量标识列表
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchListData = () => {
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
+}
+fetchListData()
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新增
+const add = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('新增成功')
+    close()
+  })
+}
+// 编辑
+const update = () => {
+  editCertificate(ruleForm.value).then((res) => {
+    ElMessage.success('修改成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if (dialogStatus.value === 'create') {
+          add()
+        }
+        else {
+          update()
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const uploadFlag = ref('')
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        //  certificateReport  originalRecord
+        ruleForm.value[uploadFlag.value] = res.data[0]
+        // 重置当前验证
+        if (uploadFlag.value === 'originalRecord') {
+          ruleFormRef.value?.clearValidate('minioFileName')
+        }
+
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  deviceRef.value.initDialog()
+}
+// 确认设备
+const confirmDevice = (device: any) => {
+  console.log(device, '设备')
+  ruleForm.value.equipmentId = device.id
+  ruleForm.value.equipmentManufactureNo = device.manufactureNo
+  ruleForm.value.equipmentName = device.equipmentName
+  ruleForm.value.equipmentNo = device.equipmentNo
+  ruleForm.value.meterIdentify = device.meterIdentify
+  ruleForm.value.checkDate = device.checkDate
+}
+// 选择分包方
+const subcontractorsRef = ref()
+const selectSubcontractors = () => {
+  subcontractorsRef.value.initDialog()
+}
+// 确认分包方
+const confirmSubcontractors = (subcontractors: any) => {
+  ruleForm.value.subcontractorNo = subcontractors.subcontractorNo
+  ruleForm.value.subcontractorName = subcontractors.companyName
+  ruleForm.value.subcontractorId = subcontractors.id
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page :title="`分包证书管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书编号" prop="certificateNo">
+              <el-input v-model.trim="ruleForm.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="ruleForm.certificateName" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位编号" prop="subcontractorNo">
+              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="检测单位编号" @focus="selectSubcontractors">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectSubcontractors">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测单位名称">
+              <el-input v-model.trim="ruleForm.subcontractorName" disabled placeholder="检测单位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="受检设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="受检设备编号" @focus="selectDevice">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDevice">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="受检设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" disabled placeholder="受检设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号">
+              <el-input v-model.trim="ruleForm.equipmentModel" disabled placeholder="型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)日期" prop="checkDate">
+              <el-date-picker
+                v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择检定日期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效期" prop="certificateValid">
+              <el-date-picker
+                v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量标识" prop="meterIdentify">
+              <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="原始记录附件" prop="originalRecord">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.originalRecord" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('originalRecord')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ '上传' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 37d81b4..a99d6e8 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -1,54 +1,68 @@
 <!-- 分包证书 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageCertificate">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delDocument, getListPage } from '@/api/eqpt/document/index'
+import { deleteCertificate, getListPage } from '@/api/eqpt/subpackage/certificate'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  fileNo: '',
-  fileName: '',
+  certificateName: '',
+  certificateNo: '',
+  createTimeEnd: '',
+  createTimeStart: '',
+  equipmentName: '',
+  equipmentNo: '',
+  subcontractorName: '',
   offset: 1,
   limit: 20,
 })
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length === 2) {
+    listQuery.createTimeStart = newVal[0]
+    listQuery.createTimeEnd = newVal[1]
+  }
+}, {
+  deep: true,
+})
 const columns = ref([
   {
     text: '证书号',
-    value: 'fileNo',
+    value: 'certificateNo',
     align: 'center',
   },
   {
     text: '证书名称',
-    value: 'fileName',
+    value: 'certificateName',
     align: 'center',
   },
   {
     text: '样品编号',
-    value: 'fileType',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '样品名称',
-    value: 'createUserName',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: 'createTime',
+    value: 'equipmentModel',
     align: 'center',
   },
   {
     text: '出厂编号',
-    value: 'implementationStatus',
+    value: 'equipmentManufactureNo',
     align: 'center',
   },
   {
     text: '检测单位',
-    value: 'implementationStatus',
+    value: 'subcontractorName',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'implementationStatus',
+    value: 'createTime',
     align: 'center',
   },
 ])
@@ -63,12 +77,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -77,8 +90,14 @@
 }
 // 重置
 const reset = () => {
-  listQuery.fileName = ''
-  listQuery.fileNo = ''
+  datetimerange.value = ''
+  listQuery.certificateName = ''
+  listQuery.certificateNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.equipmentName = ''
+  listQuery.equipmentNo = ''
+  listQuery.subcontractorName = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -97,7 +116,7 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   $router.push({
-    path: `/documentlist/${type}`,
+    path: `/pcertificatepage/${type}`,
     query: {
       row: JSON.stringify(row),
       id: row.id,
@@ -107,7 +126,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此文档信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -115,17 +134,12 @@
       type: 'warning',
     },
   ).then(() => {
-    delDocument(row.id).then((res) => {
+    deleteCertificate(row.id).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      search()
     })
   })
 }
-// 下载
-const download = () => {
-
-}
-const datetimerange = ref()
 </script>
 
 <template>
@@ -133,19 +147,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.fileNo" placeholder="证书号" clearable />
+        <el-input v-model.trim="listQuery.certificateNo" placeholder="证书号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="证书名称" clearable />
+        <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备编号" clearable />
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="受检设备编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="受检设备名称" clearable />
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="受检设备名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.fileName" placeholder="检测单位" clearable />
+        <el-input v-model.trim="listQuery.subcontractorName" placeholder="检测单位" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -175,9 +189,6 @@
               <el-button link type="danger" size="small" @click="delHandler(scope.row)">
                 删除
               </el-button>
-              <el-button link type="primary" size="small" @click="download">
-                下载
-              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue
index bde4861..a53f845 100644
--- a/src/views/tested/subpackage/directory/components/capacityTable.vue
+++ b/src/views/tested/subpackage/directory/components/capacityTable.vue
@@ -1,5 +1,5 @@
 <!-- 业务能力表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CapacityTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -84,7 +79,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -110,11 +104,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -124,12 +118,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
-            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/components/certificateTable.vue b/src/views/tested/subpackage/directory/components/certificateTable.vue
index 66c85b1..8f89914 100644
--- a/src/views/tested/subpackage/directory/components/certificateTable.vue
+++ b/src/views/tested/subpackage/directory/components/certificateTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包证书表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="CertificateTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -97,7 +92,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -123,11 +117,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 418818f..a92af02 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -1,19 +1,14 @@
-<!-- 设备基本信息 -->
-<script lang="ts" setup name="addNotice">
+<!-- 分包方 名录 编辑 -->
+<script lang="ts" setup name="SubpackageDirectoryEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import { includes } from 'lodash-es'
-import path from 'path-browserify'
-import QueryString from 'qs'
-import { routeLocationKey } from 'vue-router'
 import personTable from './personTable.vue'
 import capacityTable from './capacityTable.vue'
 import certificateTable from './certificateTable.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -370,11 +365,6 @@
               <el-form-item label="单位简称" prop="companySimpleName">
                 <el-input v-model.trim="ruleForm.companySimpleName" placeholder="单位简称" />
               </el-form-item>
-              <!-- <el-form-item label="单位简称" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;">
-                  <el-option v-for="item in useStatusList" :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="businessContent">
@@ -411,14 +401,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="6">
-              <el-form-item label="生产日期" prop="productDate">
-                <el-date-picker
-                  v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 2bae678..9014135 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,10 +1,10 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpackageDirectoryList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelDirectory, editDirectory, getDetail, getListPage, submitDirectory, deleteDirectory } from '@/api/eqpt/subpackage/directory'
+import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
+import { cancelDirectory, deleteDirectory, editDirectory, getDetail, getListPage, submitDirectory } from '@/api/eqpt/subpackage/directory'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue
index e9a2f4a..4c3becd 100644
--- a/src/views/tested/subpackage/directory/components/personTable.vue
+++ b/src/views/tested/subpackage/directory/components/personTable.vue
@@ -1,5 +1,5 @@
 <!-- 分包方人员表格 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="DirectoryPerson">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
@@ -7,13 +7,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -91,7 +86,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -117,11 +111,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -131,12 +125,12 @@
           />
           <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
               format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
-          <el-select
+          <!-- <el-select
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`"
           >
             <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
-          </el-select>
+          </el-select> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/directory/index.vue b/src/views/tested/subpackage/directory/index.vue
index c280004..093738e 100644
--- a/src/views/tested/subpackage/directory/index.vue
+++ b/src/views/tested/subpackage/directory/index.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="SubpackageDirectory">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/subpackage/review/components/deviceTable.vue b/src/views/tested/subpackage/review/components/deviceTable.vue
index 5065b78..f4cdd7c 100644
--- a/src/views/tested/subpackage/review/components/deviceTable.vue
+++ b/src/views/tested/subpackage/review/components/deviceTable.vue
@@ -1,5 +1,5 @@
 <!-- 受检设备信息列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="ReviewDeviceTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -8,13 +8,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -73,7 +68,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -84,7 +78,7 @@
 const deviceRef = ref()
 const confirm = (device: any) => {
   // 多选
-  device.forEach((item) => {
+  device.forEach((item: any) => {
     list.value.push({
       ...item,
       equipmentId: item.id,
@@ -123,14 +117,14 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in 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>
+          <span v-if="!scope.row.editable && !$route.path.includes('detail')">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 65e8fce..1e9693d 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定合格分包方名录编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="SubpackageReviewEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -8,7 +8,6 @@
 import subpackageDialog from './subpackageDialog.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { editBtn, submitBtn } from '@/utils/applyBtns'
-import { toTreeList } from '@/utils/structure'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue
index 1d84c6e..675251d 100644
--- a/src/views/tested/subpackage/review/components/list.vue
+++ b/src/views/tested/subpackage/review/components/list.vue
@@ -1,11 +1,9 @@
 <!-- 测试、校准或检定合格分包方名录列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="SubpakageReviewList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
-import { cancelReview, deleteReview, editReview, getDetail, getListPage, submitReview } from '@/api/eqpt/subpackage/review'
-import { getDictByCode } from '@/api/system/dict'
+import { cancelReview, deleteReview, getListPage, submitReview } from '@/api/eqpt/subpackage/review'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -150,7 +148,7 @@
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此名录吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue
index c824f9b..c861d63 100644
--- a/src/views/tested/subpackage/review/components/subpackageDialog.vue
+++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue
@@ -1,5 +1,5 @@
 <!-- 分包方弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<script lang="ts" setup name="SubpackageDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -27,8 +27,8 @@
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
   if (newVal.length === 2) {
-    listQuery.value.certificateValidStart = newVal[0]
-    listQuery.value.certificateValidEnd = newVal[1]
+    listQuery.value.createTimeStart = newVal[0]
+    listQuery.value.createTimeEnd = newVal[1]
   }
 })
 // 表头
@@ -88,13 +88,13 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
-  listQuery.reviewNo = ''
-  listQuery.subcontractorCompanyName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  listQuery.value.createTimeEnd = ''
+  listQuery.value.createTimeStart = ''
+  listQuery.value.createUserName = ''
+  listQuery.value.reviewNo = ''
+  listQuery.value.subcontractorCompanyName = ''
+  listQuery.value.offset = 1
+  listQuery.value.limit = 20
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/subpackage/review/index.vue b/src/views/tested/subpackage/review/index.vue
index 68cc0a4..3d83c5c 100644
--- a/src/views/tested/subpackage/review/index.vue
+++ b/src/views/tested/subpackage/review/index.vue
@@ -1,5 +1,5 @@
 <!-- 测试、校准或检定工作分包评审表 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="SubpackageReview">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {