diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 3a6e06b..d7837b0 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -153,10 +153,10 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getListPage1(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -220,6 +220,18 @@
     })
     return
   }
+  console.log(type, 'type')
+  if (type === 'update') {
+    console.log(type, 'type')
+    $router.push({
+      path: '/pcertificatepage/edit',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+      },
+    })
+    return
+  }
   $router.push({
     path: `/pcertificatepage/${type}`,
     query: {
@@ -441,9 +453,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间" clearable
         />
       </search-item>
       <search-item>
@@ -469,8 +480,14 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport('batch')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入" @click="batchImport('excel')" />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入"
+          @click="batchImport('batch')"
+        />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入"
+          @click="batchImport('excel')"
+        />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-file" title="文件导入" @click="batchImport('file')" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
@@ -495,18 +512,18 @@
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
               </el-button> -->
-              <div style="display: flex; vertical-align: bottom;line-height: 18px;">
-                <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
-                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                  查看
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
-                  编辑
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
-                  删除
-                </el-button>
-              </div>
+              <!-- <div style="display: flex; vertical-align: bottom;line-height: 18px;"> -->
+              <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+              <!-- </div> -->
             </template>
           </el-table-column>
         </template>
@@ -514,4 +531,3 @@
     </table-container>
   </app-container>
 </template>
-

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 3a6e06b..d7837b0 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -153,10 +153,10 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getListPage1(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -220,6 +220,18 @@
     })
     return
   }
+  console.log(type, 'type')
+  if (type === 'update') {
+    console.log(type, 'type')
+    $router.push({
+      path: '/pcertificatepage/edit',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+      },
+    })
+    return
+  }
   $router.push({
     path: `/pcertificatepage/${type}`,
     query: {
@@ -441,9 +453,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间" clearable
         />
       </search-item>
       <search-item>
@@ -469,8 +480,14 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport('batch')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入" @click="batchImport('excel')" />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入"
+          @click="batchImport('batch')"
+        />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入"
+          @click="batchImport('excel')"
+        />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-file" title="文件导入" @click="batchImport('file')" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
@@ -495,18 +512,18 @@
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
               </el-button> -->
-              <div style="display: flex; vertical-align: bottom;line-height: 18px;">
-                <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
-                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                  查看
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
-                  编辑
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
-                  删除
-                </el-button>
-              </div>
+              <!-- <div style="display: flex; vertical-align: bottom;line-height: 18px;"> -->
+              <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+              <!-- </div> -->
             </template>
           </el-table-column>
         </template>
@@ -514,4 +531,3 @@
     </table-container>
   </app-container>
 </template>
-
diff --git a/src/views/tested/subpackage/directory copy/components/edit.vue b/src/views/tested/subpackage/directory copy/components/edit.vue
index fdd8385..ab4198c 100644
--- a/src/views/tested/subpackage/directory copy/components/edit.vue
+++ b/src/views/tested/subpackage/directory copy/components/edit.vue
@@ -245,7 +245,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -279,7 +280,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 3a6e06b..d7837b0 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -153,10 +153,10 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getListPage1(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -220,6 +220,18 @@
     })
     return
   }
+  console.log(type, 'type')
+  if (type === 'update') {
+    console.log(type, 'type')
+    $router.push({
+      path: '/pcertificatepage/edit',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+      },
+    })
+    return
+  }
   $router.push({
     path: `/pcertificatepage/${type}`,
     query: {
@@ -441,9 +453,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间" clearable
         />
       </search-item>
       <search-item>
@@ -469,8 +480,14 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport('batch')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入" @click="batchImport('excel')" />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入"
+          @click="batchImport('batch')"
+        />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入"
+          @click="batchImport('excel')"
+        />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-file" title="文件导入" @click="batchImport('file')" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
@@ -495,18 +512,18 @@
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
               </el-button> -->
-              <div style="display: flex; vertical-align: bottom;line-height: 18px;">
-                <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
-                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                  查看
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
-                  编辑
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
-                  删除
-                </el-button>
-              </div>
+              <!-- <div style="display: flex; vertical-align: bottom;line-height: 18px;"> -->
+              <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+              <!-- </div> -->
             </template>
           </el-table-column>
         </template>
@@ -514,4 +531,3 @@
     </table-container>
   </app-container>
 </template>
-
diff --git a/src/views/tested/subpackage/directory copy/components/edit.vue b/src/views/tested/subpackage/directory copy/components/edit.vue
index fdd8385..ab4198c 100644
--- a/src/views/tested/subpackage/directory copy/components/edit.vue
+++ b/src/views/tested/subpackage/directory copy/components/edit.vue
@@ -245,7 +245,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -279,7 +280,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory copy/components/list.vue b/src/views/tested/subpackage/directory copy/components/list.vue
index 1d3c333..ba3b24c 100644
--- a/src/views/tested/subpackage/directory copy/components/list.vue
+++ b/src/views/tested/subpackage/directory copy/components/list.vue
@@ -31,7 +31,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -234,7 +234,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 3a6e06b..d7837b0 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -153,10 +153,10 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getListPage1(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -220,6 +220,18 @@
     })
     return
   }
+  console.log(type, 'type')
+  if (type === 'update') {
+    console.log(type, 'type')
+    $router.push({
+      path: '/pcertificatepage/edit',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+      },
+    })
+    return
+  }
   $router.push({
     path: `/pcertificatepage/${type}`,
     query: {
@@ -441,9 +453,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间" clearable
         />
       </search-item>
       <search-item>
@@ -469,8 +480,14 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport('batch')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入" @click="batchImport('excel')" />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入"
+          @click="batchImport('batch')"
+        />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入"
+          @click="batchImport('excel')"
+        />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-file" title="文件导入" @click="batchImport('file')" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
@@ -495,18 +512,18 @@
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
               </el-button> -->
-              <div style="display: flex; vertical-align: bottom;line-height: 18px;">
-                <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
-                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                  查看
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
-                  编辑
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
-                  删除
-                </el-button>
-              </div>
+              <!-- <div style="display: flex; vertical-align: bottom;line-height: 18px;"> -->
+              <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+              <!-- </div> -->
             </template>
           </el-table-column>
         </template>
@@ -514,4 +531,3 @@
     </table-container>
   </app-container>
 </template>
-
diff --git a/src/views/tested/subpackage/directory copy/components/edit.vue b/src/views/tested/subpackage/directory copy/components/edit.vue
index fdd8385..ab4198c 100644
--- a/src/views/tested/subpackage/directory copy/components/edit.vue
+++ b/src/views/tested/subpackage/directory copy/components/edit.vue
@@ -245,7 +245,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -279,7 +280,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory copy/components/list.vue b/src/views/tested/subpackage/directory copy/components/list.vue
index 1d3c333..ba3b24c 100644
--- a/src/views/tested/subpackage/directory copy/components/list.vue
+++ b/src/views/tested/subpackage/directory copy/components/list.vue
@@ -31,7 +31,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -234,7 +234,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 40f81c8..a1f8027 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -247,7 +247,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -282,7 +283,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 3a6e06b..d7837b0 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -153,10 +153,10 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getListPage1(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -220,6 +220,18 @@
     })
     return
   }
+  console.log(type, 'type')
+  if (type === 'update') {
+    console.log(type, 'type')
+    $router.push({
+      path: '/pcertificatepage/edit',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+      },
+    })
+    return
+  }
   $router.push({
     path: `/pcertificatepage/${type}`,
     query: {
@@ -441,9 +453,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间" clearable
         />
       </search-item>
       <search-item>
@@ -469,8 +480,14 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport('batch')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入" @click="batchImport('excel')" />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入"
+          @click="batchImport('batch')"
+        />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入"
+          @click="batchImport('excel')"
+        />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-file" title="文件导入" @click="batchImport('file')" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
@@ -495,18 +512,18 @@
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
               </el-button> -->
-              <div style="display: flex; vertical-align: bottom;line-height: 18px;">
-                <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
-                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                  查看
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
-                  编辑
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
-                  删除
-                </el-button>
-              </div>
+              <!-- <div style="display: flex; vertical-align: bottom;line-height: 18px;"> -->
+              <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+              <!-- </div> -->
             </template>
           </el-table-column>
         </template>
@@ -514,4 +531,3 @@
     </table-container>
   </app-container>
 </template>
-
diff --git a/src/views/tested/subpackage/directory copy/components/edit.vue b/src/views/tested/subpackage/directory copy/components/edit.vue
index fdd8385..ab4198c 100644
--- a/src/views/tested/subpackage/directory copy/components/edit.vue
+++ b/src/views/tested/subpackage/directory copy/components/edit.vue
@@ -245,7 +245,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -279,7 +280,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory copy/components/list.vue b/src/views/tested/subpackage/directory copy/components/list.vue
index 1d3c333..ba3b24c 100644
--- a/src/views/tested/subpackage/directory copy/components/list.vue
+++ b/src/views/tested/subpackage/directory copy/components/list.vue
@@ -31,7 +31,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -234,7 +234,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 40f81c8..a1f8027 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -247,7 +247,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -282,7 +283,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 9e4112f..cd6deee 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -37,7 +37,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -247,7 +247,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 3a6e06b..d7837b0 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -153,10 +153,10 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getListPage1(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -220,6 +220,18 @@
     })
     return
   }
+  console.log(type, 'type')
+  if (type === 'update') {
+    console.log(type, 'type')
+    $router.push({
+      path: '/pcertificatepage/edit',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+      },
+    })
+    return
+  }
   $router.push({
     path: `/pcertificatepage/${type}`,
     query: {
@@ -441,9 +453,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间" clearable
         />
       </search-item>
       <search-item>
@@ -469,8 +480,14 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport('batch')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入" @click="batchImport('excel')" />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入"
+          @click="batchImport('batch')"
+        />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入"
+          @click="batchImport('excel')"
+        />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-file" title="文件导入" @click="batchImport('file')" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
@@ -495,18 +512,18 @@
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
               </el-button> -->
-              <div style="display: flex; vertical-align: bottom;line-height: 18px;">
-                <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
-                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                  查看
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
-                  编辑
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
-                  删除
-                </el-button>
-              </div>
+              <!-- <div style="display: flex; vertical-align: bottom;line-height: 18px;"> -->
+              <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+              <!-- </div> -->
             </template>
           </el-table-column>
         </template>
@@ -514,4 +531,3 @@
     </table-container>
   </app-container>
 </template>
-
diff --git a/src/views/tested/subpackage/directory copy/components/edit.vue b/src/views/tested/subpackage/directory copy/components/edit.vue
index fdd8385..ab4198c 100644
--- a/src/views/tested/subpackage/directory copy/components/edit.vue
+++ b/src/views/tested/subpackage/directory copy/components/edit.vue
@@ -245,7 +245,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -279,7 +280,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory copy/components/list.vue b/src/views/tested/subpackage/directory copy/components/list.vue
index 1d3c333..ba3b24c 100644
--- a/src/views/tested/subpackage/directory copy/components/list.vue
+++ b/src/views/tested/subpackage/directory copy/components/list.vue
@@ -31,7 +31,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -234,7 +234,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 40f81c8..a1f8027 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -247,7 +247,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -282,7 +283,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 9e4112f..cd6deee 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -37,7 +37,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -247,7 +247,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })
diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue
index a52d407..11be3e3 100644
--- a/src/views/tested/subpackage/review/components/subpackageDialog.vue
+++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue
@@ -14,7 +14,7 @@
   createTimeEnd: '',
   createTimeStart: '',
   directorName: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
   ids: [],
   subcontractorNo: '',
   offset: 1,
@@ -98,7 +98,7 @@
   listQuery.value.createTimeEnd = ''
   listQuery.value.createTimeStart = ''
   listQuery.value.directorName = ''
-  listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
+  // listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
   listQuery.value.ids = []
   listQuery.value.subcontractorNo = ''
   listQuery.value.offset = 1

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 3a6e06b..d7837b0 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -153,10 +153,10 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getListPage1(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -220,6 +220,18 @@
     })
     return
   }
+  console.log(type, 'type')
+  if (type === 'update') {
+    console.log(type, 'type')
+    $router.push({
+      path: '/pcertificatepage/edit',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+      },
+    })
+    return
+  }
   $router.push({
     path: `/pcertificatepage/${type}`,
     query: {
@@ -441,9 +453,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间" clearable
         />
       </search-item>
       <search-item>
@@ -469,8 +480,14 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport('batch')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入" @click="batchImport('excel')" />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入"
+          @click="batchImport('batch')"
+        />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入"
+          @click="batchImport('excel')"
+        />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-file" title="文件导入" @click="batchImport('file')" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
@@ -495,18 +512,18 @@
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
               </el-button> -->
-              <div style="display: flex; vertical-align: bottom;line-height: 18px;">
-                <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
-                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                  查看
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
-                  编辑
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
-                  删除
-                </el-button>
-              </div>
+              <!-- <div style="display: flex; vertical-align: bottom;line-height: 18px;"> -->
+              <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+              <!-- </div> -->
             </template>
           </el-table-column>
         </template>
@@ -514,4 +531,3 @@
     </table-container>
   </app-container>
 </template>
-
diff --git a/src/views/tested/subpackage/directory copy/components/edit.vue b/src/views/tested/subpackage/directory copy/components/edit.vue
index fdd8385..ab4198c 100644
--- a/src/views/tested/subpackage/directory copy/components/edit.vue
+++ b/src/views/tested/subpackage/directory copy/components/edit.vue
@@ -245,7 +245,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -279,7 +280,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory copy/components/list.vue b/src/views/tested/subpackage/directory copy/components/list.vue
index 1d3c333..ba3b24c 100644
--- a/src/views/tested/subpackage/directory copy/components/list.vue
+++ b/src/views/tested/subpackage/directory copy/components/list.vue
@@ -31,7 +31,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -234,7 +234,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 40f81c8..a1f8027 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -247,7 +247,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -282,7 +283,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 9e4112f..cd6deee 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -37,7 +37,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -247,7 +247,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })
diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue
index a52d407..11be3e3 100644
--- a/src/views/tested/subpackage/review/components/subpackageDialog.vue
+++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue
@@ -14,7 +14,7 @@
   createTimeEnd: '',
   createTimeStart: '',
   directorName: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
   ids: [],
   subcontractorNo: '',
   offset: 1,
@@ -98,7 +98,7 @@
   listQuery.value.createTimeEnd = ''
   listQuery.value.createTimeStart = ''
   listQuery.value.directorName = ''
-  listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
+  // listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
   listQuery.value.ids = []
   listQuery.value.subcontractorNo = ''
   listQuery.value.offset = 1
diff --git a/src/views/tested/subpackage/task/components/list.vue b/src/views/tested/subpackage/task/components/list.vue
index 472ed28..0d6c0af 100644
--- a/src/views/tested/subpackage/task/components/list.vue
+++ b/src/views/tested/subpackage/task/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -40,6 +41,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
+  executeFlag: '',
   formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
 })
 const columns = ref([
@@ -84,6 +86,11 @@
     align: 'center',
   },
   {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
     text: '申请时间',
     value: 'createTime',
     align: 'center',
@@ -136,6 +143,7 @@
   listQuery.createDeptId = ''
   listQuery.createCompanyId = ''
   listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -283,6 +291,8 @@
 })
 // 创建单位
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
 const deptList = ref<any>([])
 // 检定单位
 const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
@@ -305,9 +315,13 @@
     }
   })
   getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
-    console.log(res.data, '1111')
+    // console.log(res.data, '1111')
     measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
   })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
 }
 fetchCommpany()
 watch(() => listQuery.createCompanyId, (newVal) => {
@@ -353,26 +367,24 @@
         </el-select>
       </search-item>
       <search-item>
-        <search-item>
-          <el-tree-select
-            v-model="listQuery.createDeptId"
-            style="width: 100%;"
-            :data="deptList"
-            :render-after-expand="false"
-            check-strictly
-            placeholder="部门"
-          />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
-            clearable
-          />
-        </search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -387,48 +399,48 @@
       >
         <template #columns>
           <el-table-column v-if="$props.statusName !== '全部'" label="审批状况" align="center">
-            <template #default=" scope ">
+            <template #default="scope">
               {{ scope.row.approvalStatusName }}
             </template>
           </el-table-column>
           <el-table-column label="操作" width="160" align="center">
-            <template #default=" scope ">
+            <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'"
+                link type="primary" size="small" @click="handler(scope.row, 'update')"
               >
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'agree')"
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.add)" link
+                type="primary" size="small" @click="approveHandler(scope.row, 'agree')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'refuse')"
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.add)" link
+                type="primary" size="small" @click="approveHandler(scope.row, 'refuse')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
-                @click="submit(scope.row)"
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.add)" link
+                type="primary" size="small" @click="submit(scope.row)"
               >
                 提交
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
-                @click="canHandler(scope.row)"
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.add)" link
+                type="primary" size="small" @click="canHandler(scope.row)"
               >
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'" link type="danger" size="small"
-                @click="delHandler(scope.row)"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'"
+                link type="danger" size="small" @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
@@ -447,4 +459,3 @@
   }
 }
 </style>
-

diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index 99716ba..dd9d1fc 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -52,3 +52,11 @@
     },
   })
 }
+// 批量编辑
+export function batchEditCertificate(data: object) {
+  return request({
+    url: '/subcontract/certificate/addOrUpdate/batch',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index b4c589c..8dae58e 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -1286,6 +1286,18 @@
             },
           },
           {
+            path: '/pcertificatepage/edit',
+            name: 'PcertificatePageUpdate',
+            component: () => import('@/views/tested/subpackage/certificate/components/editPage.vue'),
+            meta: {
+              title: '分包证书管理编辑',
+              auth: '/tested/subpackage/certificate',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/pcertificatelist',
+            },
+          },
+          {
             path: '/pcertificatepage/:type',
             name: 'PcertificatePageEdit',
             component: () => import('@/views/tested/subpackage/certificate/components/edit.vue'),
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1e07bce..9a4ab8f 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   checkDestination: {
     type: Boolean,
@@ -53,7 +55,12 @@
   offset: 1,
   directorName: '',
   companyId: '',
+  installLocationId: '',
   usageStatusList: [],
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -109,6 +116,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -123,11 +150,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
@@ -197,11 +224,16 @@
     offset: 1,
     companyId: '',
     usageStatusList: [],
+    installLocationId: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
@@ -274,12 +306,32 @@
 // 使用状态列表
 const usageStatusList = ref()
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -376,7 +428,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -387,11 +439,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -405,15 +452,32 @@
       </search-item>
       <search-item>
         <el-tree-select
-          v-model="listQuery.deptIds"
-          style="width: 100%;"
-          :data="deptList"
-          :render-after-expand="false"
-          check-strictly
-          placeholder="部门"
+          v-model="listQuery.deptIds" style="width: 100%;" :data="deptList" :render-after-expand="false"
+          check-strictly placeholder="部门"
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option
+            v-for="item in installLocationList" :key="item.id" :label="item.installLocation"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -421,11 +485,20 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间" clearable
         />
       </search-item>
       <search-item v-if="$props.checkDestination">
@@ -438,10 +511,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        v-if="dialogFormVisible"
-        :page-sizes="[5, 10, 20]"
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        v-if="dialogFormVisible" :page-sizes="[5, 10, 20]" :data="list" :total="total" :columns="columns"
+        :query="listQuery" :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true"
+        @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 432ff96..110a19f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -366,7 +366,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 98cdc3d..6f5bb18 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -339,7 +339,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 36c37a8..88d9767 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -129,6 +129,10 @@
   }
   function handler() {
     if (row.messageType || row.messageModule) {
+      if (row.messageType.includes('任务单')) {
+        nav('/meteringtask/detail')
+        return
+      }
       if (window.$pathDict[row.messageType]) {
         if (row.messageModule.includes('tzsb')) {
           nav('/speciallist/detail')
@@ -186,8 +190,8 @@
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
           <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
           />
         </search-item>
         <search-item>
@@ -238,4 +242,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 95c81c6..2fddef7 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -432,7 +432,18 @@
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
-    inUseData.value = data.meterAggrList.map((item: any) => item.count)
+    // console.log(inUseSeriesData.value, 'inUseSeriesData')
+    inUseSeriesData.value = data.nameAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
+    if (inUseSeriesData.value.length) {
+      autoScroll(false, inUseSeriesData.value)
+    }
+    inUseData.value = data.meterAggrList.map((item: any) => ({
+      value: item.count,
+      name: item.name,
+    }))
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
     resizePage()
   })
@@ -758,9 +769,36 @@
             <!-- 检定设备态势 -->
             <pie-chart v-show="inUseStatisticData.length" value-type="percentage" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
             <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-table
+              v-show="inUseSeriesData.length"
+              ref="scrollTable"
+              :data="inUseSeriesData"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65 - 20"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inUseSeriesData)"
+            >
+              <el-table-column
+                align="center"
+                label="设备名称"
+                prop="name"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="value"
+                show-overflow-tooltip
+              />
+            </el-table>
+            <!-- <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" /> -->
             <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
-            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseXAxisData.length" value-type="percentage" style="width: 33%; height: 97%;" title="在用设备计量标识" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :radius="['70%', '50%']" />
+            <!-- <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" /> -->
             <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
@@ -822,6 +860,7 @@
 .none {
   opacity: 0;
 }
+
 .more {
   cursor: pointer;
   font-size: 14px;
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index ded40cd..376b26e 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -9,7 +9,9 @@
 import { toTreeList } from '@/utils/structure'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -57,6 +59,12 @@
   limit: $props.limit,
   offset: 1,
   companyId: '',
+  installLocationId: '',
+  installLocation: '',
+  groupId: '',
+  checkOrganization: '',
+  meterIdentify: '',
+  useSign: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -112,6 +120,26 @@
     align: 'center',
   },
   {
+    text: '安装位置',
+    value: 'installLocation',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'installLocationExt',
+    align: 'center',
+  },
+  {
+    text: '设备分组',
+    value: 'groupNames',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '负责人',
     value: 'directorName',
     align: 'center',
@@ -126,16 +154,17 @@
     value: 'usageStatusName',
     align: 'center',
   },
-  {
-    text: '检定(校准)单位',
-    value: 'checkOrganization',
-    align: 'center',
-  },
+  // {
+  //   text: '检定(校准)单位',
+  //   value: 'checkOrganization',
+  //   align: 'center',
+  // },
   {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
   },
+
 ])
 const statusDict = ref<{ [key: string]: string[] }>({
   1: ['在用', '禁用', '延用'], // 封存
@@ -221,6 +250,12 @@
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: $props.limit,
     offset: 1,
+    installLocationId: '',
+    installLocation: '',
+    groupId: '',
+    checkOrganization: '',
+    meterIdentify: '',
+    useSign: '',
   }
   search()
 }
@@ -272,12 +307,27 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
   // getDeptTreeList().then((res) => {
   //   if (res.data) { // 将列表转树结构
   //     deptTreeList.value = toTreeList(res.data, '0', true)
   //   }
   // })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
+  })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    // console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -286,6 +336,11 @@
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
@@ -351,7 +406,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="75%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="90%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <el-select v-model.trim="listQuery.equipmentName" clearable filterable placeholder="设备名称">
@@ -362,11 +417,6 @@
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
-      <search-item v-if="$props.needStatus">
-        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
-          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
-      </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
@@ -389,6 +439,27 @@
         />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.installLocationId" filterable clearable placeholder="安装位置">
+          <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="详细位置" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.groupId" clearable placeholder="分组">
+          <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" clearable placeholder="计量标识">
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-select v-model.trim="listQuery.usePositionId" clearable filterable placeholder="使用岗位">
           <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
         </el-select>
@@ -396,7 +467,16 @@
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
       </search-item>
-
+      <search-item v-if="$props.needStatus">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
+          <el-option v-for="item in usageStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
diff --git a/src/views/tested/subpackage/certificate/components/deviceTable.vue b/src/views/tested/subpackage/certificate/components/deviceTable.vue
new file mode 100644
index 0000000..d043804
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/deviceTable.vue
@@ -0,0 +1,392 @@
+<!-- 受检设备信息列表 -->
+<script lang="ts" setup name="ReviewDeviceTable">
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
+import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
+import { uniqueMultiArray } from '@/utils/Array'
+import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+const $router = useRouter()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '规格型号',
+    value: 'equipmentModel',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+    required: false,
+    type: 'text',
+    width: 120,
+  },
+  // {
+  //   text: '限用说明',
+  //   value: 'limitInstruction',
+  //   required: false,
+  //   type: 'input',
+  //   width: 180
+  // },
+  {
+    text: '上次送检单位',
+    value: 'checkOrganization',
+    required: false,
+    type: 'text',
+    width: 180,
+  },
+  {
+    text: '证书编号',
+    value: 'certificateNo',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书名称',
+    value: 'certificateName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '检定(校准)机构',
+    value: 'subcontractorName',
+    required: true,
+    type: 'input',
+    width: 180,
+  },
+  {
+    text: '检定(校准)日期',
+    value: 'checkDate',
+    required: true,
+    type: 'date',
+    width: 180,
+  },
+  {
+    text: '证书附件',
+    value: 'certificateReport',
+    required: false,
+    type: 'upload',
+    width: 300,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备清单')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+    fetchTogetherData()
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+// 选择设备
+const deviceRef = ref()
+const confirm = (device: any) => {
+  // 多选
+  device.forEach((item: any) => {
+    list.value.push({
+      ...item,
+      equipmentId: item.id,
+      id: null,
+      groupId: null,
+      editable: true,
+    })
+  })
+}
+// --------------------------------------------表格操作--------------------------------------------
+// 表格标识
+const tableFlag = ref('normal')// normal普通表格  together聚合表格
+// 切换表格
+const changeTable = () => {
+  if (tableFlag.value === 'normal') {
+    tableFlag.value = 'together'
+  }
+  else {
+    tableFlag.value = 'normal'
+  }
+}
+
+const togetherColumns = ref([
+  {
+    text: '',
+    value: '',
+    align: 'center',
+    width: '38',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '总计',
+    value: 'deviceNum',
+    align: 'center',
+  },
+])
+const togetherList = ref<any>([])
+const expandList = ref<any>([])
+function fetchTogetherData() {
+  togetherList.value = []
+  const equipmentNames = uniqueMultiArray(list.value, 'equipmentName')
+  equipmentNames.forEach((element: any) => {
+    togetherList.value.push({
+      equipmentName: element.equipmentName,
+      deviceNum: list.value.filter((citem: any) => citem.equipmentName === element.equipmentName).length,
+    })
+  })
+}
+
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 控制展开行
+const expands = ref<any[]>([])
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  expandList.value = list.value.filter((item: any) => item.equipmentName === newVal[0])
+},
+{
+  deep: true,
+})
+// 选择分包方
+const subcontractorsRef = ref()
+const $index = ref(-1)
+const selectSubcontractors = (text: string, index: number) => {
+  if (text !== '检定(校准)机构') { return }
+  subcontractorsRef.value.initDialog()
+  $index.value = index
+}
+const confirmSubcontractors = (subcontractors: any) => {
+  list.value[$index.value].subcontractorNo = subcontractors.subcontractorNo
+  list.value[$index.value].subcontractorName = subcontractors.companyName
+  list.value[$index.value].subcontractorId = subcontractors.id
+}
+
+const fileRef = ref() // 文件上传input，获取input的引用
+const uploadIndex = ref(-1)
+const upload = (index: number) => {
+  uploadIndex.value = index
+  fileRef.value.click()
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        list.value[uploadIndex.value].certificateReport = res.data[0]
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+</script>
+
+<template>
+  <detail-block-switch title="设备清单">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <template #btns>
+      <template v-if="$route.path.includes('detail')">
+        <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
+      </template>
+    </template>
+    <!-- 普通表格 -->
+    <el-table
+      v-show="tableFlag === 'normal'" ref="multipleTableRef" :data="list" style="width: 100%;" border
+      :height="list.length > 8 ? 500 : null" @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" label="#" width="55" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :width="item.width" :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" class="cur">{{ scope.row[item.value]
+          }}</span>
+          <span v-if="scope.row.editable && item.type === 'text'" class="cur">{{
+            scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`" class="input" style="width: 100%;"
+            @focus="selectSubcontractors(item.text, scope.$index)"
+          />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]" type="date"
+            :placeholder="`${item.text}`" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;"
+          />
+          <span v-if="scope.row.editable && item.type === 'upload'" style="display: flex;">
+            <show-photo :minio-file-name="scope.row[item.value]" />
+            <el-button type="primary" @click="upload(scope.$index)">
+              {{ scope.row[item.value] ? '更换' : '上传' }}
+            </el-button>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <input ref="fileRef" style="display: none;" type="file" accept=".doc,.docx,.pdf" @change="onFileChange">
+    <!-- 头部 -->
+    <normal-table
+      v-show="tableFlag === 'together'" class="nortable-header" :data="[]" :total="0"
+      :columns="togetherColumns as any" :options="{
+        needIndex: false, // 是否需要序号列
+        border: true, // 是否需要上方边框
+      }
+      " :pagination="false" :is-showmulti-select="false" :query="{}"
+    />
+    <!-- 身体 -->
+    <el-table
+      v-show="tableFlag === 'together'" ref="togetherTableRef" :data="togetherList" border
+      style="width: 100%;" :row-key="getRowKeys" :expand-row-keys="expands" :show-header="false"
+      @expand-change="expandChange"
+    >
+      <el-table-column type="expand" width="38">
+        <template #default>
+          <el-table ref="expandTableRef" :data="expandList" border style="width: 100%;">
+            <el-table-column
+              v-for="item in columns" :key="item.value" :label="item.text" :prop="item.value"
+              align="center"
+            />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" prop="equipmentName" align="center" />
+      <el-table-column label="数量" align="center">
+        <template #default="scope">
+          共计{{ scope.row.deviceNum }}台
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.cur {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 37311d4..1f18c05 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -3,14 +3,16 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import orderDialog from './orderDialog.vue'
+import deviceTable from './deviceTable.vue'
 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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import { batchEditCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
 import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue'
-import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue'
+import { getDetail } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -24,41 +26,12 @@
 // 对话框类型：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: '',
-  helpInstruction: '',
-  limitInstruction: '',
+  orderId: '',
+  orderNo: '',
 }) // 表单
+const deviceList = ref<any[]>([])
 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'] }],
-  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
-  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
-  certificateReport: [{ required: true, message: '证书报告附件需上传', trigger: ['blur', 'change'] }],
-  certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-
+  orderNo: [{ required: true, message: '外送申请单必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -75,47 +48,35 @@
     ruleForm.value.createUserName = userStore.name
     ruleForm.value.createDeptId = userStore.deptId
     ruleForm.value.createDeptName = userStore.deptName
-    // 获取当前用户所在单位
-    // 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) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('新增成功')
     close()
   })
 }
 // 编辑
 const update = () => {
-  editCertificate(ruleForm.value).then((res) => {
+  batchEditCertificate(deviceList.value).then((res) => {
     ElMessage.success('修改成功')
     close()
   })
 }
 // 保存
+const deviceRef = ref()
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
+  await formEl.validate((valid: boolean) => {
+    if (valid && deviceRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -124,7 +85,7 @@
           cancelButtonText: '取消',
           type: 'warning',
         },
-      ).then((res) => {
+      ).then(() => {
         if (dialogStatus.value === 'create') {
           add()
         }
@@ -179,26 +140,6 @@
   uploadFlag.value = type
   fileRef.value.click()
 }
-// 选择设备
-const deviceRef = ref()
-const selectDevice = () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  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
-  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
-  ruleForm.value.equipmentModel = device.model
-}
 // 选择分包方
 const subcontractorsRef = ref()
 const selectSubcontractors = () => {
@@ -210,25 +151,59 @@
   ruleForm.value.subcontractorName = subcontractors.companyName
   ruleForm.value.subcontractorId = subcontractors.id
 }
-// 上次送检单位
-const lastSubcontractor = ref()
-watch(() => ruleForm.value.equipmentName, () => {
-  if (!$route.path.includes('create')) {
-    return
-  }
-  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
-    console.log(res.data)
-    lastSubcontractor.value = res.data
+// 选择外送申请单
+const orderRef = ref()
+const selectOrder = () => {
+  orderRef.value.initDialog()
+}
+// 确认任务单
+const confirmOrder = (data: any) => {
+  console.log(data, '确认的任务单')
+  ruleForm.value.orderId = data.id
+  ruleForm.value.orderNo = data.orderNo
+  // 获取任务单详情，加载设备列表
+  getDetail({ id: data.id }).then((res) => {
+    console.log(res.data, '任务单详情')
+    // deviceList.value = []
+    deviceList.value = (res.data.equipmentList || []).map((item: any) => ({
+      orderId: data.id,
+      editable: true,
+      equipmentName: item.equipmentName,
+      equipmentId: item.equipmentId,
+      manufactureNo: item.manufactureNo,
+      manufacturer: item.manufacturer,
+      equipmentModel: item.model,
+      helpInstruction: item.helpInstruction ? item.helpInstruction : '/',
+      meterIdentify: item.meterIdentify,
+      meterIdentifyName: item.meterIdentifyName,
+      certificateNo: '',
+      certificateName: '',
+      checkDate: '',
+      certificateValid: '',
+      subcontractorNo: '',
+      subcontractorName: '',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 创建时间
+      createUserId: userStore.id,
+      createUserName: userStore.name,
+      createDeptId: userStore.deptId,
+      createDeptName: userStore.deptName,
+      certificateReport: '',
+    }))
+    deviceList.value.forEach((item: any) => {
+      getLastSubcontractor(item.equipmentId).then((res) => {
+        item.checkOrganization = res.data
+      })
+    })
   })
-})
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
-    <!-- 设备弹窗 -->
-    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <!-- 任务单弹窗 -->
+    <order-dialog ref="orderRef" @confirm="confirmOrder" />
     <detail-page :title="`外送证书管理-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -240,123 +215,26 @@
       </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-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('create')" #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="受检设备编号" :disabled="!$route.path.includes('create')" @focus="selectDevice">
+            <el-form-item label="外送申请单" prop="orderNo">
+              <el-input
+                v-model.trim="ruleForm.orderNo" placeholder="外送申请单" :disabled="!$route.path.includes('create')"
+                @focus="selectOrder"
+              >
                 <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #append>
-                  <span @click="selectDevice">选择</span>
+                  <span @click="selectOrder">选择</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.equipmentModel" disabled placeholder="规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="辅助字段">
-              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="出厂编号">
-              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="$route.path.includes('create')" :span="6">
-            <el-form-item label="上次送检单位">
-              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
-            </el-form-item>
-          </el-col>
-
-          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
-            <el-form-item label="限用说明">
-              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <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="18">
-            <el-form-item label="证书报告附件" prop="certificateReport">
-              <!-- 上传组件 -->
-              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
-              <show-photo :minio-file-name="ruleForm.certificateReport" />
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
-                {{ ruleForm.certificateReport ? '替换' : '上传' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <device-table ref="deviceRef" :data="deviceList" />
       </el-form>
     </detail-block-com>
   </app-container>
diff --git a/src/views/tested/subpackage/certificate/components/editPage.vue b/src/views/tested/subpackage/certificate/components/editPage.vue
new file mode 100644
index 0000000..b748746
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/editPage.vue
@@ -0,0 +1,395 @@
+<!-- 分包方证书-编辑 -->
+<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, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate'
+import subpackageDialog from '@/views/tested/subpackage/task/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: '',
+  helpInstruction: '',
+  limitInstruction: '',
+}) // 表单
+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'] }],
+  checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }],
+  // originalRecord: [{ required: true, message: '原始记录附件需上传', trigger: ['blur', 'change'] }],
+  // certificateReport: [{ 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()
+  const data = JSON.parse($route.query.row as string)
+  ruleForm.value = data
+  ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  ruleForm.value.createUserId = userStore.id
+  ruleForm.value.createUserName = userStore.name
+  ruleForm.value.createDeptId = userStore.deptId
+  ruleForm.value.createDeptName = userStore.deptName
+  // if ($route.params.type !== 'create') {
+  //   const data = JSON.parse($route.query.row as string)
+  //   console.log(data, 'data')
+  //   ruleForm.value = data
+  //   ruleForm.value.helpInstruction = ruleForm.value.helpInstruction ? ruleForm.value.helpInstruction : '/'
+  // }
+  // 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
+  //   ruleForm.value.createDeptId = userStore.deptId
+  //   ruleForm.value.createDeptName = userStore.deptName
+  //   // 获取当前用户所在单位
+  //   // 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 === 'certificateReport') {
+          ruleFormRef.value?.clearValidate('certificateReport')
+        }
+
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        fileRef.value.value = ''
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    }).catch(() => {
+      fileRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+const upload = (type: string) => {
+  uploadFlag.value = type
+  fileRef.value.click()
+}
+// 选择设备
+const deviceRef = ref()
+const selectDevice = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  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
+  ruleForm.value.helpInstruction = device.helpInstruction ? device.helpInstruction : '/'
+  ruleForm.value.equipmentModel = device.model
+}
+// 选择分包方
+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
+}
+// 上次送检单位
+const lastSubcontractor = ref()
+watch(() => ruleForm.value.equipmentName, () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  getLastSubcontractor(ruleForm.value.equipmentId).then((res) => {
+    console.log(res.data)
+    lastSubcontractor.value = res.data
+  })
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 分包方弹窗 -->
+    <subpackage-dialog ref="subcontractorsRef" @add="confirmSubcontractors" />
+    <!-- 设备弹窗 -->
+    <device-dialog ref="deviceRef" @add="confirmDevice" />
+    <detail-page title="外送证书管理-编辑">
+      <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('create')" #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="受检设备编号"
+                :disabled="!$route.path.includes('create')" @focus="selectDevice"
+              >
+                <!-- <template v-if="!$route.path.includes('detail') && !$route.path.includes('update')" #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.equipmentModel" disabled placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="辅助字段">
+              <el-input v-model.trim="ruleForm.helpInstruction" disabled placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model.trim="ruleForm.equipmentManufactureNo" disabled placeholder="出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="上次送检单位">
+              <el-input v-model.trim="lastSubcontractor" disabled placeholder="上次送检单位" />
+            </el-form-item>
+          </el-col>
+
+          <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-col v-if="ruleForm.meterIdentify === '1'" :span="6">
+            <el-form-item label="限用说明">
+              <el-input v-model.trim="ruleForm.limitInstruction" placeholder="限用说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <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="18">
+            <el-form-item label="证书报告附件" prop="certificateReport">
+              <!-- 上传组件 -->
+              <input
+                ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf"
+                @change="onFileChange"
+              >
+              <show-photo :minio-file-name="ruleForm.certificateReport" />
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload('certificateReport')">
+                {{ ruleForm.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/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue
new file mode 100644
index 0000000..38c14b1
--- /dev/null
+++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue
@@ -0,0 +1,283 @@
+<!-- 外送任务单弹窗-单选 -->
+<script lang="ts" setup name="SelectOrder">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage1 } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+const singleChecked = ref(-1)
+const listQuery = reactive({
+  createTimeEnd: '',
+  createTimeStart: '',
+  createUserName: '',
+  orderNo: '',
+  createDeptId: '',
+  createCompanyId: '',
+  subcontractorCompanyName: '',
+  offset: 1,
+  limit: 5,
+  // approvalStatus: '4',
+  executeFlag: '',
+  formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'orderNo',
+    align: 'center',
+  },
+  {
+    text: '外送机构名称',
+    value: 'subcontractorCompanyName',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系人',
+    value: 'contact',
+    align: 'center',
+  },
+  {
+    text: '外送机构联系电话',
+    value: 'contactNumber',
+    align: 'center',
+  },
+  {
+    text: '申请单位',
+    value: 'createCompanyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'createDeptName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '外送设备数量',
+    value: 'equipmentNum',
+    align: 'center',
+  },
+  {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage1(listQuery, '全部').then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+fetchData()
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.createUserName = ''
+  listQuery.orderNo = ''
+  listQuery.createDeptId = ''
+  listQuery.createCompanyId = ''
+  listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
+  listQuery.offset = 1
+  listQuery.limit = 5
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
+const fetchCommpany = () => {
+  // 获取单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    // console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
+}
+fetchCommpany()
+watch(() => listQuery.createCompanyId, (newVal) => {
+  listQuery.createDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  else {
+    deptList.value = []
+  }
+})
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+
+const submitForm = () => {
+  if (singleChecked.value === -1) {
+    ElMessage.warning('请选择任务单')
+    return
+  }
+  emits('confirm', list.value.filter((item: any) => item.id === singleChecked.value)[0])
+  dialogFormVisible.value = false
+}
+const radioChange = (val: any) => {
+  console.log(val, 'val')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择任务单" width="75%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="false" :is-multi="true" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 3a6e06b..d7837b0 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -153,10 +153,10 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getListPage1(listQuery).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -220,6 +220,18 @@
     })
     return
   }
+  console.log(type, 'type')
+  if (type === 'update') {
+    console.log(type, 'type')
+    $router.push({
+      path: '/pcertificatepage/edit',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+      },
+    })
+    return
+  }
   $router.push({
     path: `/pcertificatepage/${type}`,
     query: {
@@ -441,9 +453,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间"
-          clearable
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="检定开始时间" end-placeholder="检定结束时间" clearable
         />
       </search-item>
       <search-item>
@@ -469,8 +480,14 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport('batch')" />
-        <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入" @click="batchImport('excel')" />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入"
+          @click="batchImport('batch')"
+        />
+        <icon-button
+          v-if="proxy.hasPerm(permUrl.import)" icon="icon-excel" title="excel导入"
+          @click="batchImport('excel')"
+        />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-file" title="文件导入" @click="batchImport('file')" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
@@ -495,18 +512,18 @@
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
               </el-button> -->
-              <div style="display: flex; vertical-align: bottom;line-height: 18px;">
-                <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
-                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                  查看
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
-                  编辑
-                </el-button>
-                <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
-                  删除
-                </el-button>
-              </div>
+              <!-- <div style="display: flex; vertical-align: bottom;line-height: 18px;"> -->
+              <!-- <show-photo :minio-file-name="scope.row.certificateReport" show-name="查看" /> -->
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm(permUrl.del)" link type="danger" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+              <!-- </div> -->
             </template>
           </el-table-column>
         </template>
@@ -514,4 +531,3 @@
     </table-container>
   </app-container>
 </template>
-
diff --git a/src/views/tested/subpackage/directory copy/components/edit.vue b/src/views/tested/subpackage/directory copy/components/edit.vue
index fdd8385..ab4198c 100644
--- a/src/views/tested/subpackage/directory copy/components/edit.vue
+++ b/src/views/tested/subpackage/directory copy/components/edit.vue
@@ -245,7 +245,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -279,7 +280,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory copy/components/list.vue b/src/views/tested/subpackage/directory copy/components/list.vue
index 1d3c333..ba3b24c 100644
--- a/src/views/tested/subpackage/directory copy/components/list.vue
+++ b/src/views/tested/subpackage/directory copy/components/list.vue
@@ -31,7 +31,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -234,7 +234,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 40f81c8..a1f8027 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -247,7 +247,8 @@
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
-            submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+            // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+            submitDirectory({ id: submitId.value }).then((res) => {
               ElMessage.success('已提交')
               close()
             })
@@ -282,7 +283,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: submitId.value }).then((res) => {
       ElMessage.success('已提交')
       close()
     })
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 9e4112f..cd6deee 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -37,7 +37,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
 })
 const columns = ref([
   {
@@ -247,7 +247,8 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitDirectory({ id: row.id, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => {
+    // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL
+    submitDirectory({ id: row.id }).then((res) => {
       ElMessage.success('已提交')
       search()
     })
diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue
index a52d407..11be3e3 100644
--- a/src/views/tested/subpackage/review/components/subpackageDialog.vue
+++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue
@@ -14,7 +14,7 @@
   createTimeEnd: '',
   createTimeStart: '',
   directorName: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
   ids: [],
   subcontractorNo: '',
   offset: 1,
@@ -98,7 +98,7 @@
   listQuery.value.createTimeEnd = ''
   listQuery.value.createTimeStart = ''
   listQuery.value.directorName = ''
-  listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
+  // listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
   listQuery.value.ids = []
   listQuery.value.subcontractorNo = ''
   listQuery.value.offset = 1
diff --git a/src/views/tested/subpackage/task/components/list.vue b/src/views/tested/subpackage/task/components/list.vue
index 472ed28..0d6c0af 100644
--- a/src/views/tested/subpackage/task/components/list.vue
+++ b/src/views/tested/subpackage/task/components/list.vue
@@ -11,6 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { keepSearchParams } from '@/utils/keepQuery'
+import { getDictByCode } from '@/api/system/dict'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -40,6 +41,7 @@
   offset: 1,
   limit: 20,
   approvalStatus: '',
+  executeFlag: '',
   formId: SCHEDULE.SUBCONTRACT_DELIVERY_APPROVAL,
 })
 const columns = ref([
@@ -84,6 +86,11 @@
     align: 'center',
   },
   {
+    text: '执行情况',
+    value: 'executeFlagName',
+    align: 'center',
+  },
+  {
     text: '申请时间',
     value: 'createTime',
     align: 'center',
@@ -136,6 +143,7 @@
   listQuery.createDeptId = ''
   listQuery.createCompanyId = ''
   listQuery.subcontractorCompanyName = ''
+  listQuery.executeFlag = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -283,6 +291,8 @@
 })
 // 创建单位
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 执行情况
+const executeFlagList = ref<{ id: string; value: string; name: string }[]>([])
 const deptList = ref<any>([])
 // 检定单位
 const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
@@ -305,9 +315,13 @@
     }
   })
   getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
-    console.log(res.data, '1111')
+    // console.log(res.data, '1111')
     measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
   })
+  // 执行情况
+  getDictByCode('executeFlag').then((res) => {
+    executeFlagList.value = res.data
+  })
 }
 fetchCommpany()
 watch(() => listQuery.createCompanyId, (newVal) => {
@@ -353,26 +367,24 @@
         </el-select>
       </search-item>
       <search-item>
-        <search-item>
-          <el-tree-select
-            v-model="listQuery.createDeptId"
-            style="width: 100%;"
-            :data="deptList"
-            :render-after-expand="false"
-            check-strictly
-            placeholder="部门"
-          />
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-            format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
-            clearable
-          />
-        </search-item>
+        <el-tree-select
+          v-model="listQuery.createDeptId" style="width: 100%;" :data="deptList"
+          :render-after-expand="false" check-strictly placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.executeFlag" filterable placeholder="执行情况" style="width: 100%;">
+          <el-option v-for="item in executeFlagList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+          range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间" clearable
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -387,48 +399,48 @@
       >
         <template #columns>
           <el-table-column v-if="$props.statusName !== '全部'" label="审批状况" align="center">
-            <template #default=" scope ">
+            <template #default="scope">
               {{ scope.row.approvalStatusName }}
             </template>
           </el-table-column>
           <el-table-column label="操作" width="160" align="center">
-            <template #default=" scope ">
+            <template #default="scope">
               <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'"
+                link type="primary" size="small" @click="handler(scope.row, 'update')"
               >
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'agree')"
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.add)" link
+                type="primary" size="small" @click="approveHandler(scope.row, 'agree')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'refuse')"
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.add)" link
+                type="primary" size="small" @click="approveHandler(scope.row, 'refuse')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
-                @click="submit(scope.row)"
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.add)" link
+                type="primary" size="small" @click="submit(scope.row)"
               >
                 提交
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
-                @click="canHandler(scope.row)"
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.add)" link
+                type="primary" size="small" @click="canHandler(scope.row)"
               >
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'" link type="danger" size="small"
-                @click="delHandler(scope.row)"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'"
+                link type="danger" size="small" @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
@@ -447,4 +459,3 @@
   }
 }
 </style>
-
diff --git a/src/views/tested/subpackage/task/components/subpackageDialog.vue b/src/views/tested/subpackage/task/components/subpackageDialog.vue
index e5f86b1..4161b72 100644
--- a/src/views/tested/subpackage/task/components/subpackageDialog.vue
+++ b/src/views/tested/subpackage/task/components/subpackageDialog.vue
@@ -14,7 +14,7 @@
   createTimeEnd: '',
   createTimeStart: '',
   directorName: '',
-  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  // formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
   ids: [],
   subcontractorNo: '',
   offset: 1,
@@ -98,7 +98,7 @@
   listQuery.value.createTimeEnd = ''
   listQuery.value.createTimeStart = ''
   listQuery.value.directorName = ''
-  listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
+  // listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
   listQuery.value.ids = []
   listQuery.value.subcontractorNo = ''
   listQuery.value.offset = 1